summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/installer')
-rw-r--r--src/libs/installer/addqtcreatorarrayvalueoperation.cpp6
-rw-r--r--src/libs/installer/component.cpp6
-rw-r--r--src/libs/installer/consumeoutputoperation.cpp2
-rw-r--r--src/libs/installer/createshortcutoperation.cpp2
-rw-r--r--src/libs/installer/fsengineclient.cpp4
-rw-r--r--src/libs/installer/macreplaceinstallnamesoperation.cpp4
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp2
-rw-r--r--src/libs/installer/qtpatch.cpp2
-rw-r--r--src/libs/installer/registerdefaultdebuggeroperation.cpp2
-rw-r--r--src/libs/installer/registertoolchainoperation.cpp4
-rw-r--r--src/libs/installer/setqtcreatorvalueoperation.cpp2
11 files changed, 18 insertions, 18 deletions
diff --git a/src/libs/installer/addqtcreatorarrayvalueoperation.cpp b/src/libs/installer/addqtcreatorarrayvalueoperation.cpp
index 7da24febe..23d160a9a 100644
--- a/src/libs/installer/addqtcreatorarrayvalueoperation.cpp
+++ b/src/libs/installer/addqtcreatorarrayvalueoperation.cpp
@@ -103,7 +103,7 @@ bool AddQtCreatorArrayValueOperation::performOperation()
int arraySize = settings.beginReadArray(arrayName);
for (int i = 0; i < arraySize; ++i) {
settings.setArrayIndex(i);
- //if it is already there we have nothing todo
+ //if it is already there we have nothing to do
if (settings.value(key).toString() == value)
return true;
oldArrayValues.append(settings.value(key).toString());
@@ -121,7 +121,7 @@ bool AddQtCreatorArrayValueOperation::performOperation()
settings.setValue(key, value);
settings.endArray();
- settings.sync(); //be save ;)
+ settings.sync(); //be safe ;)
setValue(QLatin1String("ArrayValueSet"), true);
return true;
}
@@ -178,7 +178,7 @@ bool AddQtCreatorArrayValueOperation::undoOperation()
}
settings.endArray();
- settings.sync(); //be save ;)
+ settings.sync(); //be safe ;)
return true;
}
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index c2cadafc6..6bc3e803a 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -935,7 +935,7 @@ void Component::addOperation(Operation *operation)
void Component::addElevatedOperation(Operation *operation)
{
if (value(scRequiresAdminRights, scFalse) != scTrue) {
- qWarning() << QString::fromLatin1("component %1 uses addElevatedOperation in the script, but it doesn't"
+ qWarning() << QString::fromLatin1("component %1 uses addElevatedOperation in the script, but it does not"
"have the needed RequiresAdminRights tag").arg(name());
}
addOperation(operation);
@@ -1201,7 +1201,7 @@ bool Component::isAutoDependOn(const QSet<QString> &componentsToInstall) const
QLatin1String("isAutoDependOn"));
} catch (const Error &error) {
MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(),
- QLatin1String("isAutoDependOnError"), tr("Can't resolve isAutoDependOn in %1"
+ QLatin1String("isAutoDependOnError"), tr("Cannot resolve isAutoDependOn in %1"
).arg(name()), error.message());
return false;
}
@@ -1251,7 +1251,7 @@ bool Component::isDefault() const
QLatin1String("isDefault"));
} catch (const Error &error) {
MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(),
- QLatin1String("isDefaultError"), tr("Can't resolve isDefault in %1").arg(name()),
+ QLatin1String("isDefaultError"), tr("Cannot resolve isDefault in %1").arg(name()),
error.message());
return false;
}
diff --git a/src/libs/installer/consumeoutputoperation.cpp b/src/libs/installer/consumeoutputoperation.cpp
index 2d3bc1ec0..04d7c9a8c 100644
--- a/src/libs/installer/consumeoutputoperation.cpp
+++ b/src/libs/installer/consumeoutputoperation.cpp
@@ -134,7 +134,7 @@ bool ConsumeOutputOperation::performOperation()
}
if (executableOutput.isEmpty()) {
- qWarning() << QString::fromLatin1("Can't get any query output from executable: '%1'").arg(
+ qWarning() << QString::fromLatin1("Cannot get any query output from executable: '%1'").arg(
executable.absoluteFilePath());
}
core->setValue(installerKeyName, QString::fromLatin1(executableOutput));
diff --git a/src/libs/installer/createshortcutoperation.cpp b/src/libs/installer/createshortcutoperation.cpp
index 9f9084e05..963f0aaf8 100644
--- a/src/libs/installer/createshortcutoperation.cpp
+++ b/src/libs/installer/createshortcutoperation.cpp
@@ -250,7 +250,7 @@ bool CreateShortcutOperation::undoOperation()
{
const QString &linkLocation = arguments().at(1);
if (!deleteFileNowOrLater(linkLocation) )
- qDebug() << "Can't delete:" << linkLocation;
+ qDebug() << "Cannot delete:" << linkLocation;
QDir dir; // remove all directories we created
const QStringList directoriesToDelete = value(QLatin1String("createddirs")).toStringList();
diff --git a/src/libs/installer/fsengineclient.cpp b/src/libs/installer/fsengineclient.cpp
index 62e3cf871..169b1e67b 100644
--- a/src/libs/installer/fsengineclient.cpp
+++ b/src/libs/installer/fsengineclient.cpp
@@ -795,8 +795,8 @@ void FSEngineClientHandler::Private::maybeStartServer()
const QMessageBox::Button res =
QInstaller::MessageBoxHandler::critical(QInstaller::MessageBoxHandler::currentBestSuitParent(),
- QObject::tr("Authorization Error"), QObject::tr("Couldn't get authorization."),
- QObject::tr("Couldn't get authorization that is needed for continuing the installation.\n"
+ QObject::tr("Authorization Error"), QObject::tr("Could not get authorization."),
+ QObject::tr("Could not get authorization that is needed for continuing the installation.\n"
"Either abort the installation or use the fallback solution by running\n"
"%1\nas root and then clicking ok.").arg(fallback),
QMessageBox::Abort | QMessageBox::Ok, QMessageBox::Ok);
diff --git a/src/libs/installer/macreplaceinstallnamesoperation.cpp b/src/libs/installer/macreplaceinstallnamesoperation.cpp
index a79072481..470c15b37 100644
--- a/src/libs/installer/macreplaceinstallnamesoperation.cpp
+++ b/src/libs/installer/macreplaceinstallnamesoperation.cpp
@@ -148,7 +148,7 @@ int MacReplaceInstallNamesOperation::updateExecutableInfo(MacBinaryInfo *binaryI
QProcessWrapper otool;
otool.start(QLatin1String("otool"), QStringList() << QLatin1String("-l") << binaryInfo->fileName);
if (!otool.waitForStarted()) {
- setError(UserDefinedError, tr("Can't invoke otool. Is Xcode installed?"));
+ setError(UserDefinedError, tr("Cannot invoke otool. Is Xcode installed?"));
return -1;
}
otool.waitForFinished();
@@ -231,7 +231,7 @@ bool MacReplaceInstallNamesOperation::execCommand(const QString &cmd, const QStr
QProcessWrapper process;
process.start(cmd, args);
if (!process.waitForStarted()) {
- setError(UserDefinedError, tr("Can't start process %0.").arg(cmd));
+ setError(UserDefinedError, tr("Cannot start process %0.").arg(cmd));
return false;
}
process.waitForFinished();
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index bf15f67bb..1728a85b2 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -523,7 +523,7 @@ bool PackageManagerCorePrivate::appendComponentToInstall(Component *component)
if (dependencyComponent == 0) {
QString errorMessage;
if (!dependencyComponent)
- errorMessage = QString::fromLatin1("Can't find missing dependency (%1) for %2.");
+ errorMessage = QString::fromLatin1("Cannot find missing dependency (%1) for %2.");
errorMessage = errorMessage.arg(dependencyComponentName, component->name());
qDebug() << qPrintable(errorMessage);
m_componentsToInstallError.append(errorMessage);
diff --git a/src/libs/installer/qtpatch.cpp b/src/libs/installer/qtpatch.cpp
index 6581815c2..7a1e18df3 100644
--- a/src/libs/installer/qtpatch.cpp
+++ b/src/libs/installer/qtpatch.cpp
@@ -113,7 +113,7 @@ QHash<QString, QByteArray> QtPatch::qmakeValues(const QString &qmakePath, QByteA
}
if (qmakeValueHash.isEmpty())
- qDebug() << "Can't get any query output from qmake.";
+ qDebug() << "Cannot get any query output from qmake.";
return qmakeValueHash;
}
diff --git a/src/libs/installer/registerdefaultdebuggeroperation.cpp b/src/libs/installer/registerdefaultdebuggeroperation.cpp
index d6cdac851..b076ad33e 100644
--- a/src/libs/installer/registerdefaultdebuggeroperation.cpp
+++ b/src/libs/installer/registerdefaultdebuggeroperation.cpp
@@ -119,7 +119,7 @@ bool RegisterDefaultDebuggerOperation::performOperation()
if (!creatorToolChainSettings.init(toolChainsXmlFilePath)) {
setError(UserDefinedError);
- setErrorString(tr("Can't read from tool chains xml file(%1) correctly.")
+ setErrorString(tr("Cannot read from tool chains xml file(%1) correctly.")
.arg(toolChainsXmlFilePath));
return false;
}
diff --git a/src/libs/installer/registertoolchainoperation.cpp b/src/libs/installer/registertoolchainoperation.cpp
index 0caf1451b..89d104212 100644
--- a/src/libs/installer/registertoolchainoperation.cpp
+++ b/src/libs/installer/registertoolchainoperation.cpp
@@ -111,7 +111,7 @@ bool RegisterToolChainOperation::performOperation()
if (!creatorToolChainSettings.init(toolChainsXmlFilePath)) {
setError(UserDefinedError);
- setErrorString(tr("Can't read from tool chains xml file(%1) correctly.")
+ setErrorString(tr("Cannot read from tool chains xml file(%1) correctly.")
.arg(toolChainsXmlFilePath));
return false;
}
@@ -173,7 +173,7 @@ bool RegisterToolChainOperation::undoOperation()
if (!creatorToolChainSettings.init(toolChainsXmlFilePath)) {
setError(UserDefinedError);
- setErrorString(tr("Can't read from tool chains xml file(%1) correctly.")
+ setErrorString(tr("Cannot read from tool chains xml file(%1) correctly.")
.arg(toolChainsXmlFilePath));
return false;
}
diff --git a/src/libs/installer/setqtcreatorvalueoperation.cpp b/src/libs/installer/setqtcreatorvalueoperation.cpp
index 28e0f9134..4f2bbfbc1 100644
--- a/src/libs/installer/setqtcreatorvalueoperation.cpp
+++ b/src/libs/installer/setqtcreatorvalueoperation.cpp
@@ -110,7 +110,7 @@ bool SetQtCreatorValueOperation::performOperation()
if (!group.isEmpty())
settings.endGroup();
- settings.sync(); //be save ;)
+ settings.sync(); //be safe ;)
return true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 00:48:13 +0000