More variable name renames

qgis · Nov 4, 2022 · 1c89fe3 · 1c89fe3
1 parent 7959fce
commit 1c89fe3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/src/app/gps/qgsappgpssettingsmenu.cpp b/src/app/gps/qgsappgpssettingsmenu.cpp
@@ -210,9 +210,9 @@ QgsAppGpsSettingsMenu::QgsAppGpsSettingsMenu( QWidget *parent )
   mFieldProxyModel->sourceFieldModel()->setAllowEmptyFieldName( true );
   mFieldProxyModel->setFilters( QgsFieldProxyModel::Filter::String | QgsFieldProxyModel::Filter::DateTime );
 
-  mTimeStampFieldMenu = new QMenu( tr( "Time Stamp Destination" ), this );
-  connect( mTimeStampFieldMenu, &QMenu::aboutToShow, this, &QgsAppGpsSettingsMenu::timeStampMenuAboutToShow );
-  addMenu( mTimeStampFieldMenu );
+  mTimeStampDestinationFieldMenu = new QMenu( tr( "Time Stamp Destination" ), this );
+  connect( mTimeStampDestinationFieldMenu, &QMenu::aboutToShow, this, &QgsAppGpsSettingsMenu::timeStampMenuAboutToShow );
+  addMenu( mTimeStampDestinationFieldMenu );
 
   addSeparator();
 
@@ -308,7 +308,7 @@ void QgsAppGpsSettingsMenu::timeStampMenuAboutToShow()
   QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
   mFieldProxyModel->sourceFieldModel()->setLayer( vlayer );
 
-  mTimeStampFieldMenu->clear();
+  mTimeStampDestinationFieldMenu->clear();
   bool foundPreviousField = false;
   for ( int row = 0; row < mFieldProxyModel->rowCount(); ++row )
   {
@@ -327,12 +327,12 @@ void QgsAppGpsSettingsMenu::timeStampMenuAboutToShow()
       mCurrentTimeStampField = fieldName;
       emit timeStampDestinationChanged( fieldName );
     } );
-    mTimeStampFieldMenu->addAction( fieldAction );
+    mTimeStampDestinationFieldMenu->addAction( fieldAction );
   }
 
   if ( !foundPreviousField )
   {
-    mTimeStampFieldMenu->actions().at( 0 )->setChecked( true );
+    mTimeStampDestinationFieldMenu->actions().at( 0 )->setChecked( true );
     mCurrentTimeStampField.clear();
   }
 }

diff --git a/src/app/gps/qgsappgpssettingsmenu.h b/src/app/gps/qgsappgpssettingsmenu.h
@@ -93,7 +93,7 @@ class APP_EXPORT QgsAppGpsSettingsMenu : public QMenu
     QRadioButton *mRadioNeverRecenter = nullptr;
 
     QgsFieldProxyModel *mFieldProxyModel = nullptr;
-    QMenu *mTimeStampFieldMenu = nullptr;
+    QMenu *mTimeStampDestinationFieldMenu = nullptr;
     QString mCurrentTimeStampField;
 
     friend class TestQgsGpsIntegration;

diff --git a/src/app/gps/qgsgpscanvasbridge.cpp b/src/app/gps/qgsgpscanvasbridge.cpp
@@ -332,7 +332,7 @@ void QgsGpsCanvasBridge::gpsStateChanged( const QgsGpsInformation &info )
 
     if ( mShowBearingLine )
     {
-      if ( ! mMapBearingItem )
+      if ( !mMapBearingItem )
       {
         mMapBearingItem = new QgsGpsBearingItem( mCanvas );
         updateBearingAppearance();
@@ -359,7 +359,7 @@ void QgsGpsCanvasBridge::gpsStateChanged( const QgsGpsInformation &info )
     if ( validFlag ) // update cursor position if valid position
     {
       // initially, cursor isn't drawn until first valid fix; remains visible until GPS disconnect
-      if ( ! mMapMarker )
+      if ( !mMapMarker )
       {
         mMapMarker = new QgsGpsMarker( mCanvas );
       }

diff --git a/tests/src/app/testqgsgpsintegration.cpp b/tests/src/app/testqgsgpsintegration.cpp
@@ -132,41 +132,41 @@ void TestQgsGpsIntegration::testTimeStampFields()
   mQgisApp->setActiveLayer( tempLayer );
   // allow menu to populate
   settingsMenu.timeStampMenuAboutToShow();
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().count(), 1 );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->text(), QString() );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->data().toString(), QString() );
-  QVERIFY( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->isChecked() );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().count(), 1 );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->text(), QString() );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->data().toString(), QString() );
+  QVERIFY( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->isChecked() );
 
   mQgisApp->setActiveLayer( tempLayerString );
   settingsMenu.timeStampMenuAboutToShow();
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().count(), 2 );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->text(), QString() );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->data().toString(), QString() );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 1 )->text(), QStringLiteral( "stringf" ) );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 1 )->data().toString(), QStringLiteral( "stringf" ) );
-  QVERIFY( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->isChecked() );
-  settingsMenu.mTimeStampFieldMenu->actions().at( 1 )->trigger();
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().count(), 2 );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->text(), QString() );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->data().toString(), QString() );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 1 )->text(), QStringLiteral( "stringf" ) );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 1 )->data().toString(), QStringLiteral( "stringf" ) );
+  QVERIFY( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->isChecked() );
+  settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 1 )->trigger();
   QCOMPARE( spy.count(), 1 );
   QCOMPARE( spy.at( 0 ).at( 0 ).toString(), QStringLiteral( "stringf" ) );
 
   mQgisApp->setActiveLayer( tempLayerDateTime );
   settingsMenu.timeStampMenuAboutToShow();
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().count(), 2 );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->text(), QString() );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->data().toString(), QString() );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 1 )->text(), QStringLiteral( "datetimef" ) );
-  QCOMPARE( settingsMenu.mTimeStampFieldMenu->actions().at( 1 )->data().toString(), QStringLiteral( "datetimef" ) );
-  QVERIFY( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->isChecked() );
-  settingsMenu.mTimeStampFieldMenu->actions().at( 1 )->trigger();
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().count(), 2 );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->text(), QString() );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->data().toString(), QString() );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 1 )->text(), QStringLiteral( "datetimef" ) );
+  QCOMPARE( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 1 )->data().toString(), QStringLiteral( "datetimef" ) );
+  QVERIFY( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->isChecked() );
+  settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 1 )->trigger();
   QCOMPARE( spy.count(), 2 );
   QCOMPARE( spy.at( 1 ).at( 0 ).toString(), QStringLiteral( "datetimef" ) );
 
   settingsMenu.setCurrentTimeStampField( QString() );
   settingsMenu.timeStampMenuAboutToShow();
-  QVERIFY( settingsMenu.mTimeStampFieldMenu->actions().at( 0 )->isChecked() );
+  QVERIFY( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 0 )->isChecked() );
   settingsMenu.setCurrentTimeStampField( QStringLiteral( "datetimef" ) );
   settingsMenu.timeStampMenuAboutToShow();
-  QVERIFY( settingsMenu.mTimeStampFieldMenu->actions().at( 1 )->isChecked() );
+  QVERIFY( settingsMenu.mTimeStampDestinationFieldMenu->actions().at( 1 )->isChecked() );
 }
 
 void TestQgsGpsIntegration::testGpsOptionsTimeZoneWidgets()