Fix build

nyalldawson · nyalldawson · commit 2f67bccb54c6 · 2018-06-30T09:24:38.000+10:00
diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -281,19 +281,19 @@ QgsGpsInformationWidget::QgsGpsInformationWidget( QgsMapCanvas *thepCanvas, QWid
   mCboAcquisitionInterval->setCurrentIndex( 0 );
   mCboAcquisitionInterval->setCurrentIndex( 0 );
   connect( mAcquisitionTimer.get(), &QTimer::timeout,
-           this, &QgsGPSInformationWidget::switchAcquisition );
-  connect( mCboAcquisitionInterval, static_cast<void( QComboBox::* )( const QString & )>( &QComboBox::activated ),
-           this, &QgsGPSInformationWidget::cboAcquisitionIntervalActivated );
-  connect( mCboDistanceThreshold, static_cast<void( QComboBox::* )( const QString & )>( &QComboBox::activated ),
-           this, &QgsGPSInformationWidget::cboDistanceThresholdActivated );
+           this, &QgsGpsInformationWidget::switchAcquisition );
+  connect( mCboAcquisitionInterval, qgis::overload< const QString & >::of( &QComboBox::activated ),
+           this, &QgsGpsInformationWidget::cboAcquisitionIntervalActivated );
+  connect( mCboDistanceThreshold, qgis::overload< const QString & >::of( &QComboBox::activated ),
+           this, &QgsGpsInformationWidget::cboDistanceThresholdActivated );
   mAcIntervalEdit = new QLineEdit;
   mDistThresholdEdit = new QLineEdit;
   mAcIntervalEdit->setValidator( mAcquisitionIntValidator );
   mDistThresholdEdit->setValidator( mDistanceThresholdValidator );
   connect( mAcIntervalEdit, &QLineEdit::editingFinished,
-           this, &QgsGPSInformationWidget::cboAcquisitionIntervalEdited );
+           this, &QgsGpsInformationWidget::cboAcquisitionIntervalEdited );
   connect( mDistThresholdEdit, &QLineEdit::editingFinished,
-           this, &QgsGPSInformationWidget::cboDistanceThresholdEdited );
+           this, &QgsGpsInformationWidget::cboDistanceThresholdEdited );
 
 }
 
@@ -1191,7 +1191,7 @@ void QgsGpsInformationWidget::showStatusBarMessage( const QString &msg )
 {
   QgisApp::instance()->statusBarIface()->showMessage( msg );
 }
-void QgsGPSInformationWidget::setAcquisitionInterval( int interval )
+void QgsGpsInformationWidget::setAcquisitionInterval( int interval )
 {
   mAcquisitionInterval = interval * 1000;
   if ( mAcquisitionTimer->isActive() )
@@ -1200,11 +1200,12 @@ void QgsGPSInformationWidget::setAcquisitionInterval( int interval )
   switchAcquisition();
 
 }
-void QgsGPSInformationWidget::setDistanceThreshold( int distance )
+void QgsGpsInformationWidget::setDistanceThreshold( int distance )
 {
   mDistanceThreshold = distance;
 }
-void QgsGPSInformationWidget::cboAcquisitionIntervalActivated( const QString   &text )
+
+void QgsGpsInformationWidget::cboAcquisitionIntervalActivated( const QString   &text )
 {
   if ( text == "…" )
   {
@@ -1217,7 +1218,8 @@ void QgsGPSInformationWidget::cboAcquisitionIntervalActivated( const QString   &
     setAcquisitionInterval( text.toInt() );
   }
 }
-void QgsGPSInformationWidget::cboDistanceThresholdActivated( const QString   &text )
+
+void QgsGpsInformationWidget::cboDistanceThresholdActivated( const QString   &text )
 {
   if ( text == "…" )
   {
@@ -1231,15 +1233,18 @@ void QgsGPSInformationWidget::cboDistanceThresholdActivated( const QString   &te
     setDistanceThreshold( text.toInt() );
   }
 }
-void QgsGPSInformationWidget::cboAcquisitionIntervalEdited()
+
+void QgsGpsInformationWidget::cboAcquisitionIntervalEdited()
 {
   setAcquisitionInterval( mAcIntervalEdit->text().toInt() );
 }
-void QgsGPSInformationWidget::cboDistanceThresholdEdited()
+
+void QgsGpsInformationWidget::cboDistanceThresholdEdited()
 {
   setDistanceThreshold( mDistThresholdEdit->text().toInt() );
 }
-void QgsGPSInformationWidget::switchAcquisition()
+
+void QgsGpsInformationWidget::switchAcquisition()
 {
   if ( mAcquisitionInterval > 0 )
   {

Original file line number	Diff line number	Diff line change
`@@ -281,19 +281,19 @@ QgsGpsInformationWidget::QgsGpsInformationWidget( QgsMapCanvas *thepCanvas, QWid`
`281`	`281`	`mCboAcquisitionInterval->setCurrentIndex( 0 );`
`282`	`282`	`mCboAcquisitionInterval->setCurrentIndex( 0 );`
`283`	`283`	`connect( mAcquisitionTimer.get(), &QTimer::timeout,`
`284`		`- this, &QgsGPSInformationWidget::switchAcquisition );`
`285`		`- connect( mCboAcquisitionInterval, static_cast<void( QComboBox::* )( const QString & )>( &QComboBox::activated ),`
`286`		`- this, &QgsGPSInformationWidget::cboAcquisitionIntervalActivated );`
`287`		`- connect( mCboDistanceThreshold, static_cast<void( QComboBox::* )( const QString & )>( &QComboBox::activated ),`
`288`		`- this, &QgsGPSInformationWidget::cboDistanceThresholdActivated );`
	`284`	`+ this, &QgsGpsInformationWidget::switchAcquisition );`
	`285`	`+ connect( mCboAcquisitionInterval, qgis::overload< const QString & >::of( &QComboBox::activated ),`
	`286`	`+ this, &QgsGpsInformationWidget::cboAcquisitionIntervalActivated );`
	`287`	`+ connect( mCboDistanceThreshold, qgis::overload< const QString & >::of( &QComboBox::activated ),`
	`288`	`+ this, &QgsGpsInformationWidget::cboDistanceThresholdActivated );`
`289`	`289`	`mAcIntervalEdit = new QLineEdit;`
`290`	`290`	`mDistThresholdEdit = new QLineEdit;`
`291`	`291`	`mAcIntervalEdit->setValidator( mAcquisitionIntValidator );`
`292`	`292`	`mDistThresholdEdit->setValidator( mDistanceThresholdValidator );`
`293`	`293`	`connect( mAcIntervalEdit, &QLineEdit::editingFinished,`
`294`		`- this, &QgsGPSInformationWidget::cboAcquisitionIntervalEdited );`
	`294`	`+ this, &QgsGpsInformationWidget::cboAcquisitionIntervalEdited );`
`295`	`295`	`connect( mDistThresholdEdit, &QLineEdit::editingFinished,`
`296`		`- this, &QgsGPSInformationWidget::cboDistanceThresholdEdited );`
	`296`	`+ this, &QgsGpsInformationWidget::cboDistanceThresholdEdited );`
`297`	`297`
`298`	`298`	`}`
`299`	`299`
`@@ -1191,7 +1191,7 @@ void QgsGpsInformationWidget::showStatusBarMessage( const QString &msg )`
`1191`	`1191`	`{`
`1192`	`1192`	`QgisApp::instance()->statusBarIface()->showMessage( msg );`
`1193`	`1193`	`}`
`1194`		`-void QgsGPSInformationWidget::setAcquisitionInterval( int interval )`
	`1194`	`+void QgsGpsInformationWidget::setAcquisitionInterval( int interval )`
`1195`	`1195`	`{`
`1196`	`1196`	`mAcquisitionInterval = interval * 1000;`
`1197`	`1197`	`if ( mAcquisitionTimer->isActive() )`
`@@ -1200,11 +1200,12 @@ void QgsGPSInformationWidget::setAcquisitionInterval( int interval )`
`1200`	`1200`	`switchAcquisition();`
`1201`	`1201`
`1202`	`1202`	`}`
`1203`		`-void QgsGPSInformationWidget::setDistanceThreshold( int distance )`
	`1203`	`+void QgsGpsInformationWidget::setDistanceThreshold( int distance )`
`1204`	`1204`	`{`
`1205`	`1205`	`mDistanceThreshold = distance;`
`1206`	`1206`	`}`
`1207`		`-void QgsGPSInformationWidget::cboAcquisitionIntervalActivated( const QString &text )`
	`1207`	`+`
	`1208`	`+void QgsGpsInformationWidget::cboAcquisitionIntervalActivated( const QString &text )`
`1208`	`1209`	`{`
`1209`	`1210`	`if ( text == "…" )`
`1210`	`1211`	`{`
`@@ -1217,7 +1218,8 @@ void QgsGPSInformationWidget::cboAcquisitionIntervalActivated( const QString &`
`1217`	`1218`	`setAcquisitionInterval( text.toInt() );`
`1218`	`1219`	`}`
`1219`	`1220`	`}`
`1220`		`-void QgsGPSInformationWidget::cboDistanceThresholdActivated( const QString &text )`
	`1221`	`+`
	`1222`	`+void QgsGpsInformationWidget::cboDistanceThresholdActivated( const QString &text )`
`1221`	`1223`	`{`
`1222`	`1224`	`if ( text == "…" )`
`1223`	`1225`	`{`
`@@ -1231,15 +1233,18 @@ void QgsGPSInformationWidget::cboDistanceThresholdActivated( const QString &te`
`1231`	`1233`	`setDistanceThreshold( text.toInt() );`
`1232`	`1234`	`}`
`1233`	`1235`	`}`
`1234`		`-void QgsGPSInformationWidget::cboAcquisitionIntervalEdited()`
	`1236`	`+`
	`1237`	`+void QgsGpsInformationWidget::cboAcquisitionIntervalEdited()`
`1235`	`1238`	`{`
`1236`	`1239`	`setAcquisitionInterval( mAcIntervalEdit->text().toInt() );`
`1237`	`1240`	`}`
`1238`		`-void QgsGPSInformationWidget::cboDistanceThresholdEdited()`
	`1241`	`+`
	`1242`	`+void QgsGpsInformationWidget::cboDistanceThresholdEdited()`
`1239`	`1243`	`{`
`1240`	`1244`	`setDistanceThreshold( mDistThresholdEdit->text().toInt() );`
`1241`	`1245`	`}`
`1242`		`-void QgsGPSInformationWidget::switchAcquisition()`
	`1246`	`+`
	`1247`	`+void QgsGpsInformationWidget::switchAcquisition()`
`1243`	`1248`	`{`
`1244`	`1249`	`if ( mAcquisitionInterval > 0 )`
`1245`	`1250`	`{`