migrate setting applyLeapSeconds to class (Bool, core)

qgis · Jan 25, 2023 · 6193093 · 6193093
1 parent c6eab4b
commit 6193093
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/app/options/qgsgpsoptions.cpp b/src/app/options/qgsgpsoptions.cpp
@@ -217,7 +217,7 @@ QgsGpsOptionsWidget::QgsGpsOptionsWidget( QWidget *parent )
     recenteringThreshold = settings.value( QStringLiteral( "mapExtentMultiplier" ), "50", QgsSettings::Gps ).toInt();
     rotateInterval = settings.value( QStringLiteral( "rotateMapInterval" ), 0, QgsSettings::Gps ).toInt();
 
-    applyLeapSeconds = settings.value( QStringLiteral( "applyLeapSeconds" ), true, QgsSettings::Gps ).toBool();
+    applyLeapSeconds = QgsGpsLogger::settingsApplyLeapSeconds->value();
     leapSeconds = QgsGpsLogger::settingsLeapSecondsCorrection->value();
 
     switch ( QgsGpsLogger::settingsTimeStampFormat->value() )

diff --git a/src/core/gps/qgsgpslogger.cpp b/src/core/gps/qgsgpslogger.cpp
@@ -25,6 +25,8 @@
 
 #include "qgssettingsentryimpl.h"
 const QgsSettingsEntryDouble *QgsGpsLogger::settingsDistanceThreshold = new QgsSettingsEntryDouble( QStringLiteral( "distanceThreshold" ), QgsSettings::sTreeGps, 0 );
+const QgsSettingsEntryBool *QgsGpsLogger::settingsApplyLeapSeconds = new QgsSettingsEntryBool( QStringLiteral( "applyLeapSeconds" ), QgsSettings::sTreeGps, true );
+
 const QgsSettingsEntryString *QgsGpsLogger::settingsTimestampTimeZone = new QgsSettingsEntryString( QStringLiteral( "timestampTimeZone" ), QgsSettings::sTreeGps, QString() );
 
 const QgsSettingsEntryInteger *QgsGpsLogger::settingsTimeStampFormat = new QgsSettingsEntryInteger( QStringLiteral( "timeStampFormat" ), QgsSettings::sTreeGps, Qt::LocalTime );
@@ -239,7 +241,7 @@ void QgsGpsLogger::updateGpsSettings()
 
     acquisitionInterval = QgsGpsLogger::settingsAcquisitionInterval->value();
     mDistanceThreshold = QgsGpsLogger::settingsDistanceThreshold->value();
-    mApplyLeapSettings = settings.value( QStringLiteral( "applyLeapSeconds" ), true, QgsSettings::Gps ).toBool();
+    mApplyLeapSettings = QgsGpsLogger::settingsApplyLeapSeconds->value();
     mLeapSeconds = QgsGpsLogger::settingsLeapSecondsCorrection->value();
 
     switch ( QgsGpsLogger::settingsTimeStampFormat->value() )

diff --git a/src/core/gps/qgsgpslogger.h b/src/core/gps/qgsgpslogger.h
@@ -31,6 +31,8 @@
 #include <QDateTime>
 #include "info.h"
 
+class QgsSettingsEntryBool;
+
 class QgsSettingsEntryString;
 
 class QgsSettingsEntryInteger;
@@ -58,6 +60,8 @@ class CORE_EXPORT QgsGpsLogger : public QObject
 
   public:
 
+    static const QgsSettingsEntryBool *settingsApplyLeapSeconds SIP_SKIP;
+
     static const QgsSettingsEntryString *settingsTimestampTimeZone SIP_SKIP;
 
     static const QgsSettingsEntryInteger *settingsTimeStampFormat SIP_SKIP;