Fix build with GCC 5(.5)

Task-number: QTCREATORBUG-22862
Change-Id: Iebfb84af2c5cd530a447f2b8a8296fcc171327d8
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

7 files changed, 11 insertions, 12 deletions

diff --git a/common/scopedsettingsgroupsetter.h b/common/scopedsettingsgroupsetter.h
index c66f318..adcaa61 100644
--- a/common/scopedsettingsgroupsetter.h
+++ b/common/scopedsettingsgroupsetter.h
@@ -43,12 +43,6 @@ class ScopedSettingsGroupSetter
 public:
     ScopedSettingsGroupSetter(QSettings &settings, const std::initializer_list<QString> &prefixes);
 
-    ScopedSettingsGroupSetter(const ScopedSettingsGroupSetter &) = delete;
-    ScopedSettingsGroupSetter(ScopedSettingsGroupSetter &&) = delete;
-
-    ScopedSettingsGroupSetter &operator =(const ScopedSettingsGroupSetter &) = delete;
-    ScopedSettingsGroupSetter &operator =(ScopedSettingsGroupSetter &&) = delete;
-
     ~ScopedSettingsGroupSetter();
 
     static ScopedSettingsGroupSetter forDataSource(const KUserFeedback::AbstractDataSource &ds,
diff --git a/datasources/examplesdatasource.cpp b/datasources/examplesdatasource.cpp
index 7d5e909..8dc9b2d 100644
--- a/datasources/examplesdatasource.cpp
+++ b/datasources/examplesdatasource.cpp
@@ -105,7 +105,8 @@ void ExamplesDataSource::updateOpenedExamples()
     for (auto project : ProjectExplorer::SessionManager::projects()) {
         if (project) {
             auto projectPath = QDir::fromNativeSeparators(project->projectFilePath().toString());
-            if (auto match = re.match(projectPath); match.hasMatch()) {
+            const auto match = re.match(projectPath);
+            if (match.hasMatch()) {
                 m_examplePaths << match.captured(examplePathGroupName());
             }
         }
diff --git a/datasources/qmldesignerusagetimesource.cpp b/datasources/qmldesignerusagetimesource.cpp
index 6f983e7..6bb4a32 100644
--- a/datasources/qmldesignerusagetimesource.cpp
+++ b/datasources/qmldesignerusagetimesource.cpp
@@ -49,7 +49,7 @@ QmlDesignerUsageTimeSource::QmlDesignerUsageTimeSource()
     : TimeUsageSourceBase(QStringLiteral("qmlDesignerUsageTime"))
 {
     connect(Core::ModeManager::instance(), &Core::ModeManager::currentModeChanged,
-            this, [this](auto &&modeId){
+            this, [this](Core::Id modeId){
                       updateTrackingState(QString::fromUtf8(modeId.name().toLower())); });
 
     connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged,
diff --git a/datasources/qtclicensesource.cpp b/datasources/qtclicensesource.cpp
index 3bf7907..bee2c8c 100644
--- a/datasources/qtclicensesource.cpp
+++ b/datasources/qtclicensesource.cpp
@@ -81,7 +81,8 @@ static bool hasEvaluationLicense(ExtensionSystem::IPlugin *plugin)
 static QString licenseString()
 {
     const auto plugins = ExtensionSystem::PluginManager::plugins();
-    if (auto it = std::find_if(plugins.begin(), plugins.end(), &isLicenseChecker); it != plugins.end()) {
+    const auto it = std::find_if(plugins.begin(), plugins.end(), &isLicenseChecker);
+    if (it != plugins.end()) {
         return hasEvaluationLicense((*it)->plugin()) ? evaluationStr: commercialStr;
     }
 
diff --git a/services/datasubmitter.cpp b/services/datasubmitter.cpp
index ecdab32..ea8d2c4 100644
--- a/services/datasubmitter.cpp
+++ b/services/datasubmitter.cpp
@@ -49,7 +49,8 @@ QNetworkRequest DataSubmitter::dataRequest() const
 {
     QNetworkRequest request(serverUrl());
 
-    if (auto versionString = makeVersionString(); !versionString.isEmpty()) {
+    const auto versionString = makeVersionString();
+    if (!versionString.isEmpty()) {
         request.setHeader(QNetworkRequest::UserAgentHeader, versionString);
     }
 
diff --git a/ui/usagestatisticpage.cpp b/ui/usagestatisticpage.cpp
index 10de382..a81fc87 100644
--- a/ui/usagestatisticpage.cpp
+++ b/ui/usagestatisticpage.cpp
@@ -55,7 +55,8 @@ static void applyDataSourcesActiveStatuses(const QHash<QString, bool> &statuses,
 {
     for (auto &&ds : provider.dataSources()) {
         if (ds) {
-            if (auto it = statuses.find(ds->id()); it != std::end(statuses)) {
+            const auto it = statuses.find(ds->id());
+            if (it != std::end(statuses)) {
                 ds->setActive(*it);
             }
         }
diff --git a/ui/usagestatisticwidget.cpp b/ui/usagestatisticwidget.cpp
index 5d9f692..6c65821 100644
--- a/ui/usagestatisticwidget.cpp
+++ b/ui/usagestatisticwidget.cpp
@@ -100,7 +100,8 @@ static auto dataSourceToItem(const AbstractDataSource &ds,
     auto item = std::make_unique<QListWidgetItem>(ds.name());
 
     item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-    if (auto it = activeStatusesById.find(ds.id()); it != std::end(activeStatusesById)) {
+    const auto it = activeStatusesById.find(ds.id());
+    if (it != std::end(activeStatusesById)) {
         item->setCheckState(*it ? Qt::Checked : Qt::Unchecked);
     } else {
         item->setCheckState(Qt::Checked);