aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android
diff options
context:
space:
mode:
authorhjk <[email protected]>2019-07-03 18:34:30 +0200
committerhjk <[email protected]>2019-07-04 12:28:38 +0000
commit6a58666f4403cdde1809784c1cc98668a4b02cfc (patch)
treeaf2ab09f192f779947a71022a91fb090bbfd5353 /src/plugins/android
parent599b03179e392b97023c6ebca98faa514967841a (diff)
More Utils::toSet/toList
... and unrelated cosmetic changes. Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67 Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/android')
-rw-r--r--src/plugins/android/androiddebugsupport.cpp8
-rw-r--r--src/plugins/android/androidsdkmodel.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index a703c319364..539666dc71b 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -82,15 +82,15 @@ static QStringList qtSoPaths(QtSupport::BaseQtVersion *qtVersion)
paths.insert(it.fileInfo().absolutePath());
}
}
- return paths.toList();
+ return Utils::toList(paths);
}
static QStringList uniquePaths(const QStringList &files)
{
QSet<QString> paths;
- foreach (const QString &file, files)
- paths<<QFileInfo(file).absolutePath();
- return paths.toList();
+ for (const QString &file : files)
+ paths << QFileInfo(file).absolutePath();
+ return Utils::toList(paths);
}
static QStringList getSoLibSearchPath(const ProjectNode *node)
diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp
index b72810688b3..5506ad23787 100644
--- a/src/plugins/android/androidsdkmodel.cpp
+++ b/src/plugins/android/androidsdkmodel.cpp
@@ -306,7 +306,7 @@ void AndroidSdkModel::selectMissingEssentials()
QList<const AndroidSdkPackage *> AndroidSdkModel::userSelection() const
{
- return m_changeState.toList();
+ return Utils::toList(m_changeState);
}
void AndroidSdkModel::resetSelection()