Fix some lint warnings

nyalldawson · nyalldawson · commit 98f3c6259941 · 2018-07-17T17:00:07.000+10:00
(cherry-picked from 367ab20)
diff --git a/src/app/qgsstatisticalsummarydockwidget.cpp b/src/app/qgsstatisticalsummarydockwidget.cpp
@@ -141,10 +141,10 @@ void QgsStatisticalSummaryDockWidget::copyStatistics()
 
   if ( !rows.isEmpty() )
   {
-    QString text = QString( "%1\t%2\n%3" ).arg( mStatisticsTable->horizontalHeaderItem( 0 )->text(),
+    QString text = QStringLiteral( "%1\t%2\n%3" ).arg( mStatisticsTable->horizontalHeaderItem( 0 )->text(),
                    mStatisticsTable->horizontalHeaderItem( 1 )->text(),
                    rows.join( QStringLiteral( "\n" ) ) );
-    QString html = QString( "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"><html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/></head><body><table border=\"1\"><tr><td>%1</td></tr></table></body></html>" ).arg( text );
+    QString html = QStringLiteral( "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"><html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/></head><body><table border=\"1\"><tr><td>%1</td></tr></table></body></html>" ).arg( text );
     html.replace( QStringLiteral( "\t" ), QStringLiteral( "</td><td>" ) ).replace( QStringLiteral( "\n" ), QStringLiteral( "</td></tr><tr><td>" ) );
 
     QgsClipboard clipboard;
@@ -185,7 +185,7 @@ void QgsStatisticalSummaryDockWidget::refreshStatistics()
   QgsFeatureIterator fit = QgsVectorLayerUtils::getValuesIterator( mLayer, sourceFieldExp, ok, selectedOnly );
   if ( ok )
   {
-    int featureCount = selectedOnly ? mLayer->selectedFeatureCount() : mLayer->featureCount();
+    long featureCount = selectedOnly ? mLayer->selectedFeatureCount() : mLayer->featureCount();
     std::unique_ptr< QgsStatisticsValueGatherer > gatherer = qgis::make_unique< QgsStatisticsValueGatherer >( mLayer, fit, featureCount, sourceFieldExp );
     switch ( mFieldType )
     {
@@ -198,10 +198,12 @@ void QgsStatisticalSummaryDockWidget::refreshStatistics()
       case DataType::DateTime:
         connect( gatherer.get(), &QgsStatisticsValueGatherer::taskCompleted, this, &QgsStatisticalSummaryDockWidget::updateDateTimeStatistics );
         break;
+#if 0 // not required for now - we can handle all known types
       default:
         //don't know how to handle stats for this field!
         mStatisticsTable->setRowCount( 0 );
         return;
+#endif
     }
     connect( gatherer.get(), &QgsStatisticsValueGatherer::progressChanged, mCalculatingProgressBar, &QProgressBar::setValue );
     connect( gatherer.get(), &QgsStatisticsValueGatherer::taskTerminated, this, &QgsStatisticalSummaryDockWidget::gathererFinished );
@@ -387,8 +389,6 @@ void QgsStatisticalSummaryDockWidget::statActionTriggered( bool checked )
     case DataType::DateTime:
       settingsKey = QStringLiteral( "datetime" );
       break;
-    default:
-      break;
   }
 
   QgsSettings settings;
@@ -545,8 +545,6 @@ void QgsStatisticalSummaryDockWidget::refreshStatisticsMenu()
       }
       break;
     }
-    default:
-      break;
   }
 }
 
diff --git a/src/app/qgsstatisticalsummarydockwidget.h b/src/app/qgsstatisticalsummarydockwidget.h
@@ -46,7 +46,7 @@ class QgsStatisticsValueGatherer : public QgsTask
     Q_OBJECT
 
   public:
-    QgsStatisticsValueGatherer( QgsVectorLayer *layer, QgsFeatureIterator fit, int featureCount, QString sourceFieldExp )
+    QgsStatisticsValueGatherer( QgsVectorLayer *layer, const QgsFeatureIterator &fit, long featureCount, const QString &sourceFieldExp )
       : QgsTask( tr( "Fetching statistic values" ) )
       , mFeatureIterator( fit )
       , mFeatureCount( featureCount )
@@ -97,9 +97,9 @@ class QgsStatisticsValueGatherer : public QgsTask
   private:
 
     QgsFeatureIterator mFeatureIterator;
-    int mFeatureCount;
+    long mFeatureCount = 0;
     QString mFieldExpression;
-    int mFieldIndex;
+    int mFieldIndex = -1;
     QList<QVariant> mValues;
 
     std::unique_ptr<QgsExpression> mExpression;

Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,10 @@ void QgsStatisticalSummaryDockWidget::copyStatistics()`
`141`	`141`
`142`	`142`	`if ( !rows.isEmpty() )`
`143`	`143`	`{`
`144`		`- QString text = QString( "%1\t%2\n%3" ).arg( mStatisticsTable->horizontalHeaderItem( 0 )->text(),`
	`144`	`+ QString text = QStringLiteral( "%1\t%2\n%3" ).arg( mStatisticsTable->horizontalHeaderItem( 0 )->text(),`
`145`	`145`	`mStatisticsTable->horizontalHeaderItem( 1 )->text(),`
`146`	`146`	`rows.join( QStringLiteral( "\n" ) ) );`
`147`		`- QString html = QString( "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"><html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/></head><body><table border=\"1\"><tr><td>%1</td></tr></table></body></html>" ).arg( text );`
	`147`	`+ QString html = QStringLiteral( "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"><html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/></head><body><table border=\"1\"><tr><td>%1</td></tr></table></body></html>" ).arg( text );`
`148`	`148`	`html.replace( QStringLiteral( "\t" ), QStringLiteral( "</td><td>" ) ).replace( QStringLiteral( "\n" ), QStringLiteral( "</td></tr><tr><td>" ) );`
`149`	`149`
`150`	`150`	`QgsClipboard clipboard;`
`@@ -185,7 +185,7 @@ void QgsStatisticalSummaryDockWidget::refreshStatistics()`
`185`	`185`	`QgsFeatureIterator fit = QgsVectorLayerUtils::getValuesIterator( mLayer, sourceFieldExp, ok, selectedOnly );`
`186`	`186`	`if ( ok )`
`187`	`187`	`{`
`188`		`- int featureCount = selectedOnly ? mLayer->selectedFeatureCount() : mLayer->featureCount();`
	`188`	`+ long featureCount = selectedOnly ? mLayer->selectedFeatureCount() : mLayer->featureCount();`
`189`	`189`	`std::unique_ptr< QgsStatisticsValueGatherer > gatherer = qgis::make_unique< QgsStatisticsValueGatherer >( mLayer, fit, featureCount, sourceFieldExp );`
`190`	`190`	`switch ( mFieldType )`
`191`	`191`	`{`
`@@ -198,10 +198,12 @@ void QgsStatisticalSummaryDockWidget::refreshStatistics()`
`198`	`198`	`case DataType::DateTime:`
`199`	`199`	`connect( gatherer.get(), &QgsStatisticsValueGatherer::taskCompleted, this, &QgsStatisticalSummaryDockWidget::updateDateTimeStatistics );`
`200`	`200`	`break;`
	`201`	`+#if 0 // not required for now - we can handle all known types`
`201`	`202`	`default:`
`202`	`203`	`//don't know how to handle stats for this field!`
`203`	`204`	`mStatisticsTable->setRowCount( 0 );`
`204`	`205`	`return;`
	`206`	`+#endif`
`205`	`207`	`}`
`206`	`208`	`connect( gatherer.get(), &QgsStatisticsValueGatherer::progressChanged, mCalculatingProgressBar, &QProgressBar::setValue );`
`207`	`209`	`connect( gatherer.get(), &QgsStatisticsValueGatherer::taskTerminated, this, &QgsStatisticalSummaryDockWidget::gathererFinished );`
`@@ -387,8 +389,6 @@ void QgsStatisticalSummaryDockWidget::statActionTriggered( bool checked )`
`387`	`389`	`case DataType::DateTime:`
`388`	`390`	`settingsKey = QStringLiteral( "datetime" );`
`389`	`391`	`break;`
`390`		`- default:`
`391`		`- break;`
`392`	`392`	`}`
`393`	`393`
`394`	`394`	`QgsSettings settings;`
`@@ -545,8 +545,6 @@ void QgsStatisticalSummaryDockWidget::refreshStatisticsMenu()`
`545`	`545`	`}`
`546`	`546`	`break;`
`547`	`547`	`}`
`548`		`- default:`
`549`		`- break;`
`550`	`548`	`}`
`551`	`549`	`}`
`552`	`550`