diff options
| author |  jan Iversen <jani@apache.org> | 2018-08-19 12:00:01 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-25 11:49:47 -0700 |
| commit | 1bc361b2ea1bb22a72fb8bd8ca7f58f735697a13 (patch) | |
| tree | 89bd53cabb21af4603ef0a58a6b4ee5024edb28b /core | |
| parent | be9c47954cbed040c15d6f3d9441e463dc5433a5 (diff) | |
| download | subsurface-1bc361b2ea1bb22a72fb8bd8ca7f58f735697a13.tar.gz | |
core/tests: add uuidString to qPrefUpdateManager
add static class variable uuidString to qPrefUpdateManager
correct test cases
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/settings/qPrefUpdateManager.cpp | 12 | ||||
| -rw-r--r-- | core/settings/qPrefUpdateManager.h | 10 |
2 files changed, 20 insertions, 2 deletions
diff --git a/core/settings/qPrefUpdateManager.cpp b/core/settings/qPrefUpdateManager.cpp index 23952f700..709631519 100644 --- a/core/settings/qPrefUpdateManager.cpp +++ b/core/settings/qPrefUpdateManager.cpp @@ -5,6 +5,9 @@ static const QString group = QStringLiteral("UpdateManager"); +QString qPrefUpdateManager::st_uuidString; +static const QString st_uuidString_default = ""; + qPrefUpdateManager::qPrefUpdateManager(QObject *parent) : QObject(parent) { } @@ -21,6 +24,9 @@ void qPrefUpdateManager::loadSync(bool doSync) disk_dont_check_for_updates(doSync); disk_last_version_used(doSync); disk_next_check(doSync); + if (!doSync) { + load_uuidString(); + } } @@ -51,7 +57,9 @@ void qPrefUpdateManager::set_next_check(const QDate& value) void qPrefUpdateManager::disk_next_check(bool doSync) { if (doSync) - qPrefPrivate::instance()->setting.setValue(group + "/NextCheck", prefs.update_manager.next_check); + qPrefPrivate::propSetValue(group + "/NextCheck", prefs.update_manager.next_check); else - prefs.update_manager.next_check = qPrefPrivate::instance()->setting.value(group + "/NextCheck", 0).toInt(); + prefs.update_manager.next_check = qPrefPrivate::propValue(group + "/NextCheck", 0).toInt(); } + +HANDLE_PROP_QSTRING(UpdateManager, "UodateManager/UUID", uuidString); diff --git a/core/settings/qPrefUpdateManager.h b/core/settings/qPrefUpdateManager.h index a1ed468ba..151c2edc4 100644 --- a/core/settings/qPrefUpdateManager.h +++ b/core/settings/qPrefUpdateManager.h @@ -12,6 +12,7 @@ class qPrefUpdateManager : public QObject { Q_PROPERTY(bool dont_check_exists READ dont_check_exists WRITE set_dont_check_exists NOTIFY dont_check_exists_changed); Q_PROPERTY(const QString last_version_used READ last_version_used WRITE set_last_version_used NOTIFY last_version_used_changed); Q_PROPERTY(const QDate next_check READ next_check WRITE set_next_check NOTIFY next_check_changed); + Q_PROPERTY(const QString uuidString READ uuidString WRITE set_uuidString NOTIFY uuidString_changed); public: qPrefUpdateManager(QObject *parent = NULL); @@ -27,23 +28,32 @@ public: static bool dont_check_exists() { return prefs.update_manager.dont_check_exists; } static const QString last_version_used() { return prefs.update_manager.last_version_used; } static const QDate next_check() { return QDate::fromJulianDay(prefs.update_manager.next_check); } + static const QString uuidString() { return st_uuidString; } public slots: static void set_dont_check_for_updates(bool value); static void set_dont_check_exists(bool value); static void set_last_version_used(const QString& value); static void set_next_check(const QDate& value); + static void set_uuidString(const QString& value); signals: void dont_check_for_updates_changed(bool value); void dont_check_exists_changed(bool value); void last_version_used_changed(const QString& value); void next_check_changed(const QDate& value); + void uuidString_changed(const QString& value); private: static void disk_dont_check_for_updates(bool doSync); static void disk_last_version_used(bool doSync); static void disk_next_check(bool doSync); + + // load only for class variables + static void load_uuidString(); + + // class variables not present in structure preferences + static QString st_uuidString; }; #endif |