mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup[5/6]: remove unused preferences

Browse source 
Remove all the code to handle the preferences itself.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-09-11 16:02:02 +02:00 • committed by Dirk Hohndel
parent bb0ac5f778
commit 19e8fa4eaf
3 changed files with 0 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/settings/qPrefCloudStorage.cpp
View file

@ -24,8 +24,6 @@ void qPrefCloudStorage::loadSync(bool doSync)
disk_cloud_timeout(doSync);
disk_cloud_verification_status(doSync);
disk_save_password_local(doSync);
disk_save_userid_local(doSync);
disk_userid(doSync);
}
void qPrefCloudStorage::set_cloud_base_url(const QString &value)
@ -81,22 +79,3 @@ HANDLE_PREFERENCE_INT(CloudStorage, "timeout", cloud_timeout);
HANDLE_PREFERENCE_INT(CloudStorage, "cloud_verification_status", cloud_verification_status);
HANDLE_PREFERENCE_BOOL(CloudStorage, "save_password_local", save_password_local);
HANDLE_PREFERENCE_BOOL(CloudStorage, "save_userid_local", save_userid_local);
SET_PREFERENCE_TXT(CloudStorage, userid);
void qPrefCloudStorage::disk_userid(bool doSync)
{
if (doSync) {
// always save in new position (part of cloud storage group)
qPrefPrivate::propSetValue(keyFromGroupAndName(group, "subsurface_webservice_uid"), prefs.userid, default_prefs.userid);
} else {
//WARNING: UserId was stored outside of any group.
// try to read from new location, if it fails read from old location
prefs.userid = copy_qstring(qPrefPrivate::propValue(keyFromGroupAndName(group, "subsurface_webservice_uid"), "NoUserIdHere").toString());
if (QString(prefs.userid) == "NoUserIdHere") {
const QString group = QStringLiteral("");
prefs.userid = copy_qstring(qPrefPrivate::propValue(keyFromGroupAndName(group,"subsurface_webservice_uid"), default_prefs.userid).toString());
}
}
}

10
core/settings/qPrefCloudStorage.h
View file

@ -16,8 +16,6 @@ class qPrefCloudStorage : public QObject {
Q_PROPERTY(int cloud_verification_status READ cloud_verification_status WRITE set_cloud_verification_status NOTIFY cloud_verification_status_changed);
Q_PROPERTY(int cloud_timeout READ cloud_timeout WRITE set_cloud_timeout NOTIFY cloud_timeout_changed);
Q_PROPERTY(bool save_password_local READ save_password_local WRITE set_save_password_local NOTIFY save_password_local_changed);
Q_PROPERTY(bool save_userid_local READ save_userid_local WRITE set_save_userid_local NOTIFY save_userid_local_changed);
Q_PROPERTY(QString userid READ userid WRITE set_userid NOTIFY userid_changed);
public:
qPrefCloudStorage(QObject *parent = NULL);
@ -38,8 +36,6 @@ public:
static int cloud_timeout() { return prefs.cloud_timeout; }
static int cloud_verification_status() { return prefs.cloud_verification_status; }
static bool save_password_local() { return prefs.save_password_local; }
static bool save_userid_local() { return prefs.save_userid_local; }
static QString userid() { return prefs.userid; }
public slots:
static void set_cloud_base_url(const QString &value);
@ -50,8 +46,6 @@ public slots:
static void set_cloud_timeout(int value);
static void set_cloud_verification_status(int value);
static void set_save_password_local(bool value);
static void set_save_userid_local(bool value);
static void set_userid(const QString &value);
signals:
void cloud_base_url_changed(const QString &value);
@ -62,8 +56,6 @@ signals:
void cloud_timeout_changed(int value);
void cloud_verification_status_changed(int value);
void save_password_local_changed(bool value);
void save_userid_local_changed(bool value);
void userid_changed(const QString &value);
private:
// functions to load/sync variable with disk
@ -75,8 +67,6 @@ private:
static void disk_cloud_timeout(bool doSync);
static void disk_cloud_verification_status(bool doSync);
static void disk_save_password_local(bool doSync);
static void disk_save_userid_local(bool doSync);
static void disk_userid(bool doSync);
};
#endif