migrate setting timestampTimeZone to class (String, core)

qgis · Jan 25, 2023 · c6eab4b · c6eab4b
1 parent 1e7db48
commit c6eab4b
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
@@ -234,7 +234,7 @@ QgsGpsOptionsWidget::QgsGpsOptionsWidget( QWidget *parent )
         timeSpec = Qt::TimeSpec::TimeZone;
         break;
     }
-    timeZone = settings.value( QStringLiteral( "timestampTimeZone" ), QVariant(), QgsSettings::Gps ).toString();
+    timeZone = QgsGpsLogger::settingsTimestampTimeZone->value();
   }
 
   mOffsetFromUtc->setValue( offsetFromUtc );

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 QgsSettingsEntryString *QgsGpsLogger::settingsTimestampTimeZone = new QgsSettingsEntryString( QStringLiteral( "timestampTimeZone" ), QgsSettings::sTreeGps, QString() );
+
 const QgsSettingsEntryInteger *QgsGpsLogger::settingsTimeStampFormat = new QgsSettingsEntryInteger( QStringLiteral( "timeStampFormat" ), QgsSettings::sTreeGps, Qt::LocalTime );
 
 const QgsSettingsEntryInteger *QgsGpsLogger::settingsLeapSecondsCorrection = new QgsSettingsEntryInteger( QStringLiteral( "leapSecondsCorrection" ), QgsSettings::sTreeGps, 18 );
@@ -254,7 +256,7 @@ void QgsGpsLogger::updateGpsSettings()
         mTimeStampSpec = Qt::TimeSpec::TimeZone;
         break;
     }
-    mTimeZone = settings.value( QStringLiteral( "timestampTimeZone" ), QVariant(), QgsSettings::Gps ).toString();
+    mTimeZone = QgsGpsLogger::settingsTimestampTimeZone->value();
   }
 
   mAcquisitionInterval = acquisitionInterval * 1000;

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