summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/licenseoperation.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-04-01 13:41:21 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2015-04-08 08:36:57 +0000
commitc3f5744d2e0a2cd907c0601240d188b583ae79cb (patch)
tree1894ba867a12f77a4927d8c20549ae537556e555 /src/libs/installer/licenseoperation.cpp
parentce703ed61b42bebe1e43a0e2ee00e815503edf20 (diff)
Don't mix iterator and const_iterator
Add QT_STRICT_ITERATORS to disallow implicit conversions between iterator and const_iterator. This avoids potential detaches of the Qt containers. Change-Id: I79d381f531ddda9ac402c6f5c63cdc7c6808a0bd Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/licenseoperation.cpp')
-rw-r--r--src/libs/installer/licenseoperation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/licenseoperation.cpp b/src/libs/installer/licenseoperation.cpp
index 9f4a232f8..dc39d5ecf 100644
--- a/src/libs/installer/licenseoperation.cpp
+++ b/src/libs/installer/licenseoperation.cpp
@@ -75,7 +75,7 @@ bool LicenseOperation::performOperation()
dir.mkpath(targetDir);
setArguments(QStringList(targetDir));
- for (QVariantMap::const_iterator it = licenses.begin(); it != licenses.end(); ++it) {
+ for (QVariantMap::const_iterator it = licenses.constBegin(); it != licenses.constEnd(); ++it) {
QFile file(targetDir + QDir::separator() + it.key());
if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
setError(UserDefinedError);
@@ -93,7 +93,7 @@ bool LicenseOperation::performOperation()
bool LicenseOperation::undoOperation()
{
- QVariantMap licenses = value(QLatin1String("licenses")).toMap();
+ const QVariantMap licenses = value(QLatin1String("licenses")).toMap();
if (licenses.isEmpty()) {
setError(UserDefinedError);
setErrorString(tr("No license files found to delete."));