Also remove Q_FOREACH from all gui headers

qgis · Apr 26, 2018 · d0240e8 · d0240e8
1 parent 2d5ec75
commit d0240e8
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 35 deletions.
diff --git a/src/gui/raster/qgspalettedrendererwidget.cpp b/src/gui/raster/qgspalettedrendererwidget.cpp
@@ -805,3 +805,39 @@ void QgsPalettedRendererModel::deleteAll()
 
 ///@endcond PRIVATE
 
+
+void QgsPalettedRendererClassGatherer::run()
+{
+  mWasCanceled = false;
+
+  // allow responsive cancelation
+  mFeedback = new QgsRasterBlockFeedback();
+  connect( mFeedback, &QgsRasterBlockFeedback::progressChanged, this, &QgsPalettedRendererClassGatherer::progressChanged );
+
+  QgsPalettedRasterRenderer::ClassData newClasses = QgsPalettedRasterRenderer::classDataFromRaster( mLayer->dataProvider(), mBandNumber, mRamp.get(), mFeedback );
+
+  // combine existing classes with new classes
+  QgsPalettedRasterRenderer::ClassData::iterator classIt = newClasses.begin();
+  for ( ; classIt != newClasses.end(); ++classIt )
+  {
+    // check if existing classes contains this same class
+    for ( const QgsPalettedRasterRenderer::Class &existingClass : qgis::as_const( mClasses ) )
+    {
+      if ( existingClass.value == classIt->value )
+      {
+        classIt->color = existingClass.color;
+        classIt->label = existingClass.label;
+        break;
+      }
+    }
+  }
+  mClasses = newClasses;
+
+  // be overly cautious - it's *possible* stop() might be called between deleting mFeedback and nulling it
+  mFeedbackMutex.lock();
+  delete mFeedback;
+  mFeedback = nullptr;
+  mFeedbackMutex.unlock();
+
+  emit collectedClasses();
+}
diff --git a/src/gui/raster/qgspalettedrendererwidget.h b/src/gui/raster/qgspalettedrendererwidget.h
@@ -49,41 +49,7 @@ class QgsPalettedRendererClassGatherer: public QThread
       , mWasCanceled( false )
     {}
 
-    void run() override
-    {
-      mWasCanceled = false;
-
-      // allow responsive cancelation
-      mFeedback = new QgsRasterBlockFeedback();
-      connect( mFeedback, &QgsRasterBlockFeedback::progressChanged, this, &QgsPalettedRendererClassGatherer::progressChanged );
-
-      QgsPalettedRasterRenderer::ClassData newClasses = QgsPalettedRasterRenderer::classDataFromRaster( mLayer->dataProvider(), mBandNumber, mRamp.get(), mFeedback );
-
-      // combine existing classes with new classes
-      QgsPalettedRasterRenderer::ClassData::iterator classIt = newClasses.begin();
-      for ( ; classIt != newClasses.end(); ++classIt )
-      {
-        // check if existing classes contains this same class
-        Q_FOREACH ( const QgsPalettedRasterRenderer::Class &existingClass, mClasses )
-        {
-          if ( existingClass.value == classIt->value )
-          {
-            classIt->color = existingClass.color;
-            classIt->label = existingClass.label;
-            break;
-          }
-        }
-      }
-      mClasses = newClasses;
-
-      // be overly cautious - it's *possible* stop() might be called between deleting mFeedback and nulling it
-      mFeedbackMutex.lock();
-      delete mFeedback;
-      mFeedback = nullptr;
-      mFeedbackMutex.unlock();
-
-      emit collectedClasses();
-    }
+    void run() override;
 
     //! Informs the gatherer to immediately stop collecting values
     void stop()