move definition to source

qgis · Oct 8, 2018 · f404751 · f404751
1 parent 775d603
commit f404751
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 47 deletions.
diff --git a/src/app/qgsstatisticalsummarydockwidget.cpp b/src/app/qgsstatisticalsummarydockwidget.cpp
@@ -21,6 +21,8 @@
 #include "qgsstatisticalsummarydockwidget.h"
 #include "qgsstatisticalsummary.h"
 #include "qgsvectorlayer.h"
+#include "qgsfeedback.h"
+#include "qgsvectorlayerutils.h"
 
 #include <QTableWidget>
 #include <QAction>
@@ -578,3 +580,49 @@ QgsStatisticalSummaryDockWidget::DataType QgsStatisticalSummaryDockWidget::field
 
   return DataType::Numeric;
 }
+
+QgsStatisticsValueGatherer::QgsStatisticsValueGatherer( QgsVectorLayer *layer, const QgsFeatureIterator &fit, long featureCount, const QString &sourceFieldExp )
+  : QgsTask( tr( "Fetching statistic values" ) )
+  , mFeatureIterator( fit )
+  , mFeatureCount( featureCount )
+  , mFieldExpression( sourceFieldExp )
+{
+  mFieldIndex = layer->fields().lookupField( mFieldExpression );
+  if ( mFieldIndex == -1 )
+  {
+    // use expression, already validated
+    mExpression.reset( new QgsExpression( mFieldExpression ) );
+    mContext.appendScopes( QgsExpressionContextUtils::globalProjectLayerScopes( layer ) );
+  }
+}
+
+bool QgsStatisticsValueGatherer::run()
+{
+  QgsFeature f;
+  int current = 0;
+  while ( mFeatureIterator.nextFeature( f ) )
+  {
+    if ( mExpression )
+    {
+      mContext.setFeature( f );
+      QVariant v = mExpression->evaluate( &mContext );
+      mValues << v;
+    }
+    else
+    {
+      mValues << f.attribute( mFieldIndex );
+    }
+
+    if ( isCanceled() )
+    {
+      return false;
+    }
+
+    current++;
+    if ( mFeatureCount > 0 )
+    {
+      setProgress( 100.0 * static_cast< double >( current ) / mFeatureCount );
+    }
+  }
+  return true;
+}
diff --git a/src/app/qgsstatisticalsummarydockwidget.h b/src/app/qgsstatisticalsummarydockwidget.h
@@ -23,8 +23,6 @@
 #include "qgsdatetimestatisticalsummary.h"
 #include "qgsdockwidget.h"
 #include "qgsfeatureiterator.h"
-#include "qgsfeedback.h"
-#include "qgsvectorlayerutils.h"
 #include "qgstaskmanager.h"
 
 #include "qgis_app.h"
@@ -47,51 +45,9 @@ class QgsStatisticsValueGatherer : public QgsTask
     Q_OBJECT
 
   public:
-    QgsStatisticsValueGatherer( QgsVectorLayer *layer, const QgsFeatureIterator &fit, long featureCount, const QString &sourceFieldExp )
-      : QgsTask( tr( "Fetching statistic values" ) )
-      , mFeatureIterator( fit )
-      , mFeatureCount( featureCount )
-      , mFieldExpression( sourceFieldExp )
-    {
-      mFieldIndex = layer->fields().lookupField( mFieldExpression );
-      if ( mFieldIndex == -1 )
-      {
-        // use expression, already validated
-        mExpression.reset( new QgsExpression( mFieldExpression ) );
-        mContext.appendScopes( QgsExpressionContextUtils::globalProjectLayerScopes( layer ) );
-      }
-    }
-
-    bool run() override
-    {
-      QgsFeature f;
-      int current = 0;
-      while ( mFeatureIterator.nextFeature( f ) )
-      {
-        if ( mExpression )
-        {
-          mContext.setFeature( f );
-          QVariant v = mExpression->evaluate( &mContext );
-          mValues << v;
-        }
-        else
-        {
-          mValues << f.attribute( mFieldIndex );
-        }
-
-        if ( isCanceled() )
-        {
-          return false;
-        }
-
-        current++;
-        if ( mFeatureCount > 0 )
-        {
-          setProgress( 100.0 * static_cast< double >( current ) / mFeatureCount );
-        }
-      }
-      return true;
-    }
+    QgsStatisticsValueGatherer( QgsVectorLayer *layer, const QgsFeatureIterator &fit, long featureCount, const QString &sourceFieldExp );
+
+    bool run() override;
 
     QList<QVariant> values() const { return mValues; }