aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@theqtcompany.com>2015-06-16 13:40:40 +0200
committerJarek Kobus <jaroslaw.kobus@theqtcompany.com>2015-06-16 12:07:31 +0000
commitf7c98fa6abfe7e125bd7ac7e32e4332701599dd4 (patch)
tree7848682ac09bdeb08447032a85d012a69a679ab2
parent427170e504274228c90677844cb38350fd9675d9 (diff)
Replace assignment of null QString() with a call to clear().
Looks like it's a kind of rule in QtCreator code. Change-Id: I92fb60055273d66d6e459245836df5b90d7a3cc6 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
-rw-r--r--share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp2
-rw-r--r--src/plugins/updateinfo/updateinfoplugin.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp b/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
index ce3942788ff..60075f750e6 100644
--- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
@@ -339,7 +339,7 @@ bool SharedMemory::initKeyInternal()
return false;
}
- m_errorString = QString();
+ m_errorString.clear();
m_error = QSharedMemory::NoError;
return true;
}
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index b327d2eb2ea..8512fcc8a02 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -141,7 +141,7 @@ void UpdateInfoPlugin::stopCheckForUpdates()
if (!d->m_checkUpdatesCommand)
return;
- d->m_collectedOutput = QString();
+ d->m_collectedOutput.clear();
d->m_checkUpdatesCommand->disconnect();
d->m_checkUpdatesCommand->cancel();
d->m_checkUpdatesCommand = 0;
@@ -203,7 +203,7 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString *
if (!QFileInfo(d->m_maintenanceTool).isExecutable()) {
*errorMessage = tr("The maintenance tool at \"%1\" is not an executable. Check your installation.")
.arg(d->m_maintenanceTool);
- d->m_maintenanceTool = QString();
+ d->m_maintenanceTool.clear();
return false;
}