2 files changed, 16 insertions, 17 deletions
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp
index b0e552bf2..fe012c9b9 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.cpp
+++ b/core/subsurface-qt/SettingsObjectWrapper.cpp
@@ -811,6 +811,17 @@ void CloudStorageSettings::setBackgroundSync(bool value)
 	emit backgroundSyncChanged(value);
 }
 
+void CloudStorageSettings::setSaveUserIdLocal(short int value)
+{
+	prefs.save_userid_local = value;
+	emit saveUserIdLocalChanged(value);
+}
+
+short int CloudStorageSettings::saveUserIdLocal() const
+{
+	return prefs.save_userid_local;
+}
+
 void CloudStorageSettings::setBaseUrl(const QString& value)
 {
 	free((void*)prefs.cloud_base_url);
@@ -1621,17 +1632,6 @@ QObject(parent),
 {
 }
 
-void SettingsObjectWrapper::setSaveUserIdLocal(short int value)
-{
-	Q_UNUSED(value);
-	//TODO: Find where this is stored on the preferences.
-}
-
-short int SettingsObjectWrapper::saveUserIdLocal() const
-{
-	return prefs.save_userid_local;
-}
-
 SettingsObjectWrapper* SettingsObjectWrapper::instance()
 {
 	static SettingsObjectWrapper settings;
diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
index c1fd8a7ef..157c7432c 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.h
+++ b/core/subsurface-qt/SettingsObjectWrapper.h
@@ -262,6 +262,7 @@ class CloudStorageSettings : public QObject {
 	Q_PROPERTY(QString userid            READ userId             WRITE setUserId             NOTIFY userIdChanged)
 	Q_PROPERTY(QString base_url          READ baseUrl            WRITE setBaseUrl            NOTIFY baseUrlChanged)
 	Q_PROPERTY(QString git_url           READ gitUrl             WRITE setGitUrl             NOTIFY gitUrlChanged)
+	Q_PROPERTY(short save_userid_local  READ saveUserIdLocal WRITE setSaveUserIdLocal NOTIFY saveUserIdLocalChanged)
 	Q_PROPERTY(bool git_local_only       READ gitLocalOnly       WRITE setGitLocalOnly       NOTIFY gitLocalOnlyChanged)
 	Q_PROPERTY(bool save_password_local  READ savePasswordLocal  WRITE setSavePasswordLocal  NOTIFY savePasswordLocalChanged)
 	Q_PROPERTY(short verification_status READ verificationStatus WRITE setVerificationStatus NOTIFY verificationStatusChanged)
@@ -279,6 +280,7 @@ public:
 	short verificationStatus() const;
 	bool backgroundSync() const;
 	bool gitLocalOnly() const;
+	short saveUserIdLocal() const;
 
 public slots:
 	void setPassword(const QString& value);
@@ -292,6 +294,7 @@ public slots:
 	void setVerificationStatus(short value);
 	void setBackgroundSync(bool value);
 	void setGitLocalOnly(bool value);
+	void setSaveUserIdLocal(short value);
 
 signals:
 	void passwordChanged(const QString& value);
@@ -305,6 +308,8 @@ signals:
 	void verificationStatusChanged(short value);
 	void backgroundSyncChanged(bool value);
 	void gitLocalOnlyChanged(bool value);
+	void saveUserIdLocalChanged(short value);
+
 private:
 	QString group;
 };
@@ -601,7 +606,6 @@ private:
 
 class SettingsObjectWrapper : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(short save_userid_local  READ saveUserIdLocal WRITE setSaveUserIdLocal NOTIFY saveUserIdLocalChanged)
 
 	Q_PROPERTY(TechnicalDetailsSettings*   techical_details MEMBER techDetails CONSTANT)
 	Q_PROPERTY(PartialPressureGasSettings* pp_gas           MEMBER pp_gas CONSTANT)
@@ -619,7 +623,6 @@ class SettingsObjectWrapper : public QObject {
 	Q_PROPERTY(LocationServiceSettingsObjectWrapper* Location  MEMBER location_settings CONSTANT)
 public:
 	static SettingsObjectWrapper *instance();
-	short saveUserIdLocal() const;
 
 	TechnicalDetailsSettings *techDetails;
 	PartialPressureGasSettings *pp_gas;
@@ -635,12 +638,8 @@ public:
 	AnimationsSettingsObjectWrapper *animation_settings;
 	LocationServiceSettingsObjectWrapper *location_settings;
 
-public slots:
-	void setSaveUserIdLocal(short value);
 private:
 	SettingsObjectWrapper(QObject *parent = NULL);
-signals:
-	void saveUserIdLocalChanged(short value);
 };
 
 #endif