Remove more deprecation warnings

Change-Id: Ie50e41737a4bf7bea41f550df7cc765267e8a144
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

9 files changed, 21 insertions, 15 deletions

diff --git a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
index 79cc8ff81ab..c3ca95c6a0f 100644
--- a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
+++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
@@ -50,6 +50,7 @@
 #include <utils/qtcassert.h>
 
 #include <QDebug>
+#include <QElapsedTimer>
 #include <QFileInfo>
 #include <QLoggingCategory>
 #include <QSharedPointer>
@@ -302,7 +303,7 @@ WaitForUpdatedCodeWarnings::WaitForUpdatedCodeWarnings(ClangEditorDocumentProces
 
 bool WaitForUpdatedCodeWarnings::wait(int timeOutInMs) const
 {
-    QTime time;
+    QElapsedTimer time;
     time.start();
 
     forever {
@@ -580,7 +581,7 @@ bool ProcessEventsCommand::run()
 {
     qCDebug(debug) << "line" << context().lineNumber << "ProcessEventsCommand" << m_durationInMs;
 
-    QTime time;
+    QElapsedTimer time;
     time.start();
 
     forever {
diff --git a/src/plugins/classview/classviewnavigationwidget.cpp b/src/plugins/classview/classviewnavigationwidget.cpp
index 3b7bcc68814..b2fd94427af 100644
--- a/src/plugins/classview/classviewnavigationwidget.cpp
+++ b/src/plugins/classview/classviewnavigationwidget.cpp
@@ -40,6 +40,7 @@
 #include <QDebug>
 #include <QVariant>
 #include <QVBoxLayout>
+#include <QElapsedTimer>
 
 enum { debug = false };
 
@@ -267,7 +268,7 @@ void NavigationWidget::onDataUpdate(QSharedPointer<QStandardItem> result)
     if (result.isNull())
         return;
 
-    QTime timer;
+    QElapsedTimer timer;
     if (debug)
         timer.start();
     // update is received. root item must be updated - and received information
diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp
index 0ba865c7f2a..13f258b9ebc 100644
--- a/src/plugins/classview/classviewparser.cpp
+++ b/src/plugins/classview/classviewparser.cpp
@@ -53,6 +53,7 @@
 #include <QReadWriteLock>
 #include <QReadLocker>
 #include <QWriteLocker>
+#include <QElapsedTimer>
 
 enum { debug = false };
 
@@ -274,7 +275,7 @@ ParserTreeItem::ConstPtr Parser::findItemByRoot(const QStandardItem *item, bool
 
 ParserTreeItem::ConstPtr Parser::parse()
 {
-    QTime time;
+    QElapsedTimer time;
     if (debug)
         time.start();
 
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index ec8c062b04e..9ac8b0bfb49 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1006,7 +1006,7 @@ Breakpoints BreakHandler::findBreakpointsByIndex(const QList<QModelIndex> &list)
         if (Breakpoint bp = findBreakpointByIndex(index))
             items.insert(bp);
     }
-    return items.toList();
+    return Utils::toList(items);
 }
 
 SubBreakpoints BreakHandler::findSubBreakpointsByIndex(const QList<QModelIndex> &list) const
@@ -1016,7 +1016,7 @@ SubBreakpoints BreakHandler::findSubBreakpointsByIndex(const QList<QModelIndex>
         if (SubBreakpoint sbp = findSubBreakpointByIndex(index))
             items.insert(sbp);
     }
-    return items.toList();
+    return Utils::toList(items);
 
 }
 
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 561c9e6e954..fc6e74b866e 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -442,7 +442,7 @@ void DebuggerMainWindow::restorePersistentSettings()
     theMainWindow->setAutoHideTitleBars(settings->value(AUTOHIDE_TITLEBARS_KEY, true).toBool());
     theMainWindow->showCentralWidget(settings->value(SHOW_CENTRALWIDGET_KEY, true).toBool());
     theMainWindow->d->m_persistentChangedDocks
-            = QSet<QString>::fromList(settings->value(CHANGED_DOCK_KEY).toStringList());
+            = Utils::toSet(settings->value(CHANGED_DOCK_KEY).toStringList());
     settings->endGroup();
 
     qCDebug(perspectivesLog) << "LOADED DOCKS:" << theMainWindow->d->m_persistentChangedDocks;
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index d2114c4441a..09e89beed0f 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -77,6 +77,7 @@
 #include <QSettings>
 #include <QPluginLoader>
 #include <QTime>
+#include <QElapsedTimer>
 
 #include <algorithm>
 
@@ -351,9 +352,9 @@ void FormEditorData::setupViewActions()
 void FormEditorData::fullInit()
 {
     QTC_ASSERT(m_initStage == FormEditorW::RegisterPlugins, return);
-    QTime *initTime = 0;
+    QElapsedTimer *initTime = 0;
     if (Designer::Constants::Internal::debug) {
-        initTime = new QTime;
+        initTime = new QElapsedTimer;
         initTime->start();
     }
 
diff --git a/src/plugins/modeleditor/packageviewcontroller.cpp b/src/plugins/modeleditor/packageviewcontroller.cpp
index 37c665d4f05..8b45a2443ca 100644
--- a/src/plugins/modeleditor/packageviewcontroller.cpp
+++ b/src/plugins/modeleditor/packageviewcontroller.cpp
@@ -31,6 +31,8 @@
 #include "qmt/model/mdependency.h"
 #include "qmt/model_controller/modelcontroller.h"
 
+#include <utils/algorithm.h>
+
 #include <QSet>
 
 namespace ModelEditor {
@@ -151,7 +153,7 @@ void PackageViewController::createAncestorDependencies(qmt::MObject *object1, qm
 bool PackageViewController::haveMatchingStereotypes(const qmt::MObject *object1,
                                                     const qmt::MObject *object2)
 {
-    return !(object1->stereotypes().toSet() & object2->stereotypes().toSet()).isEmpty();
+    return !(Utils::toSet(object1->stereotypes()) & Utils::toSet(object2->stereotypes())).isEmpty();
 }
 
 
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index 39206d971f2..1fffb8d2093 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -385,8 +385,8 @@ void QmakePriFile::watchFolders(const QSet<FilePath> &folders)
     QSet<QString> toWatch = folderStrings;
     toWatch.subtract(m_watchedFolders);
 
-    m_project->unwatchFolders(toUnwatch.toList(), this);
-    m_project->watchFolders(toWatch.toList(), this);
+    m_project->unwatchFolders(Utils::toList(toUnwatch), this);
+    m_project->watchFolders(Utils::toList(toWatch), this);
 
     m_watchedFolders = folderStrings;
 }
@@ -1312,7 +1312,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input)
                 result->includedFiles.children.insert(subDirName, subDir);
             }
 
-            result->exactSubdirs = subDirs.toSet();
+            result->exactSubdirs = Utils::toSet(subDirs);
         }
 
         // Convert ProFileReader::includeFiles to IncludedPriFile structure
diff --git a/src/plugins/todo/cpptodoitemsscanner.cpp b/src/plugins/todo/cpptodoitemsscanner.cpp
index 938f7922fc3..2c6f8f0e1c4 100644
--- a/src/plugins/todo/cpptodoitemsscanner.cpp
+++ b/src/plugins/todo/cpptodoitemsscanner.cpp
@@ -59,8 +59,8 @@ void CppTodoItemsScanner::scannerParamsChanged()
 
     QSet<QString> filesToBeUpdated;
     foreach (const CppTools::ProjectInfo &info, modelManager->projectInfos())
-        filesToBeUpdated.unite(Utils::transform(info.project().data()->files(ProjectExplorer::Project::SourceFiles),
-                                                &Utils::FilePath::toString).toSet());
+        filesToBeUpdated.unite(Utils::transform<QSet>(info.project().data()->files(ProjectExplorer::Project::SourceFiles),
+                                                &Utils::FilePath::toString));
 
     modelManager->updateSourceFiles(filesToBeUpdated);
 }