From 074688b9ba3aa2d38ef375bf278f36bd8ef977b1 Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Fri, 31 Oct 2014 09:19:23 +0100 Subject: Replace all occurrences of "can not" with "cannot" Also fix some other issues in the touched strings, making them comply to Qt style. Change-Id: I46515e1a3bec5e21610943ded2ef7fa1f09a4a15 Reviewed-by: Kai Koehne Reviewed-by: Leena Miettinen --- src/libs/installer/qtpatch.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libs/installer/qtpatch.cpp') diff --git a/src/libs/installer/qtpatch.cpp b/src/libs/installer/qtpatch.cpp index 96ccd6673..b324cad44 100644 --- a/src/libs/installer/qtpatch.cpp +++ b/src/libs/installer/qtpatch.cpp @@ -125,7 +125,7 @@ bool QtPatch::patchBinaryFile(const QString &fileName, openFileForPatching(&file); if (!file.isOpen()) { - qDebug() << "qpatch: warning: file" << qPrintable(fileName) << "can not open."; + qDebug() << "qpatch: warning: file" << qPrintable(fileName) << "cannot open."; qDebug() << qPrintable(file.errorString()); return false; } @@ -200,7 +200,7 @@ bool QtPatch::patchTextFile(const QString &fileName, bool QtPatch::openFileForPatching(QFile *file) { if (file->openMode() == QIODevice::NotOpen) { - // in some cases the file can not open, because another process is blocking it(filewatcher ...) + // in some cases the file cannot be opened, because another process is blocking it (filewatcher ...) int waitCount = 0; while (!file->open(QFile::ReadWrite) && waitCount < 60) { ++waitCount; @@ -209,7 +209,7 @@ bool QtPatch::openFileForPatching(QFile *file) } return file->openMode() == QFile::ReadWrite; } - qDebug() << QString::fromLatin1("qpatch: error: File '%1 is open, so it can not open it again.").arg( + qDebug() << QString::fromLatin1("qpatch: error: File '%1 is open, so it cannot be opened again.").arg( file->fileName()); return false; } -- cgit v1.2.3