diff options
author | Niels Weber <niels.weber@digia.com> | 2013-02-05 12:08:18 +0100 |
---|---|---|
committer | Niels Weber <niels.weber@digia.com> | 2013-02-07 16:43:33 +0100 |
commit | 1d7e30eca88a14c4a7a6333e51d70f8186c9e54a (patch) | |
tree | 4bf299eecc9793a3d4597e0f9df7d9be5a7d7c94 /src | |
parent | b32aa577b9647a79537e9218748c9987d2129728 (diff) |
Typos, style and language improvements.
Change-Id: Ibc7d4ea8319b48b908adad75aa3a43858667cdde
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/setdemospathonqtoperation.cpp | 4 | ||||
-rw-r--r-- | src/libs/installer/setexamplespathonqtoperation.cpp | 6 | ||||
-rw-r--r-- | src/libs/installer/setimportspathonqtcoreoperation.cpp | 6 | ||||
-rw-r--r-- | src/libs/installer/setpathonqtcoreoperation.cpp | 12 | ||||
-rw-r--r-- | src/libs/installer/setpluginpathonqtcoreoperation.cpp | 4 | ||||
-rw-r--r-- | src/libs/installer/setqtcreatorvalueoperation.cpp | 16 | ||||
-rw-r--r-- | src/libs/installer/simplemovefileoperation.cpp | 10 | ||||
-rw-r--r-- | src/libs/installer/utils.cpp | 2 |
8 files changed, 31 insertions, 29 deletions
diff --git a/src/libs/installer/setdemospathonqtoperation.cpp b/src/libs/installer/setdemospathonqtoperation.cpp index a997b29ba..a013ad0cb 100644 --- a/src/libs/installer/setdemospathonqtoperation.cpp +++ b/src/libs/installer/setdemospathonqtoperation.cpp @@ -83,7 +83,7 @@ bool SetDemosPathOnQtOperation::performOperation() if (qmakeValueHash.isEmpty()) { setError(UserDefinedError); setErrorString(tr("The output of \n%1 -query\nis not parseable. Please file a bugreport with this " - "dialog https://bugreports.qt-project.org.\noutput: %2").arg(QDir::toNativeSeparators(qmakePath), + "dialog at https://bugreports.qt-project.org.\noutput: %2").arg(QDir::toNativeSeparators(qmakePath), QString::fromUtf8(qmakeOutput))); return false; } @@ -91,7 +91,7 @@ bool SetDemosPathOnQtOperation::performOperation() QByteArray oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_DEMOS")); bool oldQtPathFromQMakeIsEmpty = oldValue.isEmpty(); if (oldQtPathFromQMakeIsEmpty) { - qDebug() << "qpatch: warning: It was not able to get the old values from" << qmakePath; + qDebug() << "qpatch: warning: It was not possible to get the old values from" << qmakePath; } if (newValue.size() >= 255) { diff --git a/src/libs/installer/setexamplespathonqtoperation.cpp b/src/libs/installer/setexamplespathonqtoperation.cpp index e28443d43..49a24601d 100644 --- a/src/libs/installer/setexamplespathonqtoperation.cpp +++ b/src/libs/installer/setexamplespathonqtoperation.cpp @@ -82,8 +82,8 @@ bool SetExamplesPathOnQtOperation::performOperation() if (qmakeValueHash.isEmpty()) { setError(UserDefinedError); - setErrorString(tr("The output of \n%1 -query\nis not parseable. Please file a bugreport with this " - "dialog https://bugreports.qt-project.org.\noutput: %2").arg(QDir::toNativeSeparators(qmakePath), + setErrorString(tr("The output of \n'%1 -query'\nis not parseable. Please file a bugreport with this " + "dialog at https://bugreports.qt-project.org.\noutput: %2").arg(QDir::toNativeSeparators(qmakePath), QString::fromUtf8(qmakeOutput))); return false; } @@ -91,7 +91,7 @@ bool SetExamplesPathOnQtOperation::performOperation() QByteArray oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_EXAMPLES")); bool oldQtPathFromQMakeIsEmpty = oldValue.isEmpty(); if (oldQtPathFromQMakeIsEmpty) { - qDebug() << "qpatch: warning: It was not able to get the old values from" << qmakePath; + qDebug() << "qpatch: warning: It was not possible to get the old values from" << qmakePath; } if (newValue.size() >= 255) { diff --git a/src/libs/installer/setimportspathonqtcoreoperation.cpp b/src/libs/installer/setimportspathonqtcoreoperation.cpp index 84b863aa1..a44d74f2b 100644 --- a/src/libs/installer/setimportspathonqtcoreoperation.cpp +++ b/src/libs/installer/setimportspathonqtcoreoperation.cpp @@ -55,7 +55,7 @@ namespace { QFileInfo fileInfo(binaryPath); if (!fileInfo.exists()) { - qDebug() << QString::fromLatin1("qpatch: warning: file %1 not found").arg(binaryPath); + qDebug() << QString::fromLatin1("qpatch: warning: file '%1' not found").arg(binaryPath); return QByteArray(); } @@ -68,7 +68,7 @@ namespace { } Q_ASSERT(file.isOpen()); if (!file.isOpen()) { - qDebug() << QString::fromLatin1("qpatch: warning: file %1 can not be opened as ReadOnly.").arg( + qDebug() << QString::fromLatin1("qpatch: warning: file '%1' can not be opened as ReadOnly.").arg( binaryPath); qDebug() << file.errorString(); return QByteArray(); @@ -87,7 +87,7 @@ namespace { int stringEndPosition = offset; while(source.at(stringEndPosition++) != '\0') {} - //after search string till the first \0 it should be our looking for QByteArray + // between the search string and the first \0 is the QByteArray we are looking for return source.mid(offset + searchValue.size(), stringEndPosition - offset); } } diff --git a/src/libs/installer/setpathonqtcoreoperation.cpp b/src/libs/installer/setpathonqtcoreoperation.cpp index 980b4b7fd..a64dfae12 100644 --- a/src/libs/installer/setpathonqtcoreoperation.cpp +++ b/src/libs/installer/setpathonqtcoreoperation.cpp @@ -55,7 +55,8 @@ namespace { QFileInfo fileInfo(binaryPath); if (!fileInfo.exists()) { - qDebug() << "qpatch: warning: file '" << binaryPath << "' not found"; + qDebug() << QString::fromLatin1("qpatch: warning: file '%1' not found.").arg( + binaryPath); return QByteArray(); } @@ -67,7 +68,8 @@ namespace { } Q_ASSERT(file.isOpen()); if (!file.isOpen()) { - qDebug() << "qpatch: warning: file '" << binaryPath << "' can not open as ReadOnly."; + qDebug() << QString::fromLatin1("qpatch: warning: file '%1' can not be opened as ReadOnly.").arg( + binaryPath); qDebug() << file.errorString(); return QByteArray(); } @@ -86,10 +88,10 @@ namespace { int stringEndPosition = offset; - //go to the position where other data starts + // go to the position where the other data starts while (source.at(stringEndPosition++) != '\0') {} - //after search string till the first \0 it should be our looking for QByteArray + // between the search string and the first \0 is the QByteArray we are looking for return source.mid(offset + searchValue.size(), stringEndPosition - offset); } } @@ -138,7 +140,7 @@ bool SetPathOnQtCoreOperation::performOperation() return false; } - if (255 < newValue.size()) { + if (newValue.size() >= 255) { qDebug() << "qpatch: error: newQtDir needs to be less than 255 characters."; return false; } diff --git a/src/libs/installer/setpluginpathonqtcoreoperation.cpp b/src/libs/installer/setpluginpathonqtcoreoperation.cpp index ac681626e..de9057b4b 100644 --- a/src/libs/installer/setpluginpathonqtcoreoperation.cpp +++ b/src/libs/installer/setpluginpathonqtcoreoperation.cpp @@ -67,7 +67,7 @@ namespace { } Q_ASSERT(file.isOpen()); if (!file.isOpen()) { - qDebug() << QString::fromLatin1("qpatch: warning: file '%1' can not open as ReadOnly.").arg( + qDebug() << QString::fromLatin1("qpatch: warning: file '%1' can not be opened as ReadOnly.").arg( binaryPath); qDebug() << file.errorString(); return QByteArray(); @@ -86,7 +86,7 @@ namespace { int stringEndPosition = offset; while(source.at(stringEndPosition++) != '\0') {} - //after search string till the first \0 it should be our looking for QByteArray + // between the search string and the first \0 is the QByteArray we are looking for return source.mid(offset + searchValue.size(), stringEndPosition - offset); } } diff --git a/src/libs/installer/setqtcreatorvalueoperation.cpp b/src/libs/installer/setqtcreatorvalueoperation.cpp index 7638d3c36..24e3ced4e 100644 --- a/src/libs/installer/setqtcreatorvalueoperation.cpp +++ b/src/libs/installer/setqtcreatorvalueoperation.cpp @@ -83,8 +83,8 @@ bool SetQtCreatorValueOperation::performOperation() const QString &rootInstallPath = args.at(0); //for example "C:\\Nokia_SDK\\" if (!rootInstallPath.isEmpty()) { - qWarning() << QString::fromLatin1("Because of internal changes the first argument(\"%1\") on %2 "\ - "operation is just ignored, please be aware of that").arg(rootInstallPath, name()); + qWarning() << QString::fromLatin1("Because of internal changes the first argument '%1' on '%2' "\ + "operation is just ignored, please be aware of that.").arg(rootInstallPath, name()); } const QString &group = groupName(args.at(1)); @@ -94,7 +94,7 @@ bool SetQtCreatorValueOperation::performOperation() QString qtCreatorInstallerSettingsFileName = core->value(scQtCreatorInstallerSettingsFile); if (qtCreatorInstallerSettingsFileName.isEmpty()) { setError(UserDefinedError); - setErrorString(tr("There is no value set for %1 on the installer object.").arg( + setErrorString(tr("There is no value set for '%1' on the installer object.").arg( scQtCreatorInstallerSettingsFile)); return false; } @@ -121,8 +121,8 @@ bool SetQtCreatorValueOperation::undoOperation() const QString &rootInstallPath = args.at(0); //for example "C:\\Nokia_SDK\\" if (!rootInstallPath.isEmpty()) { - qWarning() << QString::fromLatin1("Because of internal changes the first argument(\"%1\") on %2 "\ - "operation is just ignored, please be aware of that").arg(rootInstallPath, name()); + qWarning() << QString::fromLatin1("Because of internal changes the first argument '%1' on '%2' "\ + "operation is just ignored, please be aware of that.").arg(rootInstallPath, name()); } const QString &group = groupName(args.at(1)); @@ -131,18 +131,18 @@ bool SetQtCreatorValueOperation::undoOperation() PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>(); if (!core) { setError(UserDefinedError); - setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); + setErrorString(tr("Needed installer object in '%1' operation is empty.").arg(name())); return false; } // default value is the old value to keep the possibility that old saved operations can run undo #ifdef Q_OS_MAC QString qtCreatorInstallerSettingsFileName = core->value(scQtCreatorInstallerSettingsFile, - QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/Nokia/QtCreator.ini").arg( + QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/QtProject/QtCreator.ini").arg( core->value(QLatin1String("TargetDir")))); #else QString qtCreatorInstallerSettingsFileName = core->value(scQtCreatorInstallerSettingsFile, - QString::fromLatin1("%1/QtCreator/share/qtcreator/Nokia/QtCreator.ini").arg(core->value( + QString::fromLatin1("%1/QtCreator/share/qtcreator/QtProject/QtCreator.ini").arg(core->value( QLatin1String("TargetDir")))); #endif diff --git a/src/libs/installer/simplemovefileoperation.cpp b/src/libs/installer/simplemovefileoperation.cpp index 41037d286..ae415b058 100644 --- a/src/libs/installer/simplemovefileoperation.cpp +++ b/src/libs/installer/simplemovefileoperation.cpp @@ -69,7 +69,7 @@ bool SimpleMoveFileOperation::performOperation() if (source.isEmpty() || target.isEmpty()) { setError(UserDefinedError); - setErrorString(tr("None of the arguments can be empty: source(%1), target(%2).") + setErrorString(tr("None of the arguments can be empty: source (%1), target (%2).") .arg(source, target)); return false; } @@ -80,7 +80,7 @@ bool SimpleMoveFileOperation::performOperation() if (file.exists()) { if (!file.remove()) { setError(UserDefinedError); - setErrorString(tr("Can not copy source(%1) to target(%2), because target exists and is " + setErrorString(tr("Can not move source '%1' to target '%2', because target exists and is " "not removable.").arg(source, target)); return false; } @@ -89,12 +89,12 @@ bool SimpleMoveFileOperation::performOperation() file.setFileName(source); if (!file.rename(target)) { setError(UserDefinedError); - setErrorString(tr("Can not move source(%1) to target(%2): %3").arg(source, target, + setErrorString(tr("Can not move source '%1' to target '%2': %3").arg(source, target, file.errorString())); return false; } - emit outputTextChanged(tr("Move %1 to %2.").arg(source, target)); + emit outputTextChanged(tr("Move '%1' to '%2'.").arg(source, target)); return true; } @@ -104,7 +104,7 @@ bool SimpleMoveFileOperation::undoOperation() const QString target = arguments().at(1); QFile(target).rename(source); - emit outputTextChanged(tr("Move %1 to %2.").arg(target, source)); + emit outputTextChanged(tr("Move '%1' to '%2'.").arg(target, source)); return true; } diff --git a/src/libs/installer/utils.cpp b/src/libs/installer/utils.cpp index 246b830e5..1112bcebb 100644 --- a/src/libs/installer/utils.cpp +++ b/src/libs/installer/utils.cpp @@ -317,7 +317,7 @@ static QString qt_create_commandline(const QString &program, const QStringList & } programName.replace(QLatin1Char('/'), QLatin1Char('\\')); - // add the prgram as the first arg ... it works better + // add the program as the first arg ... it works better args = programName + QLatin1Char(' '); } |