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

Revert "core/tests: add loadFromCloud var to qPrefCloudStorage"

Browse source 
This reverts commit b7a1bb670c.

Signed-off-by: Jan Iversen <jani@apache.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen 2018-09-06 17:13:48 -07:00 • committed by Dirk Hohndel
parent e71b049498
commit 12fc3f1747
4 changed files with 1 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/settings/qPrefCloudStorage.cpp
View file

@ -7,6 +7,7 @@ static const QString group = QStringLiteral("CloudStorage");
qPrefCloudStorage::qPrefCloudStorage(QObject *parent) : QObject(parent) qPrefCloudStorage::qPrefCloudStorage(QObject *parent) : QObject(parent)
{ {
} }
qPrefCloudStorage *qPrefCloudStorage::instance() qPrefCloudStorage *qPrefCloudStorage::instance()
{ {
static qPrefCloudStorage *self = new qPrefCloudStorage; static qPrefCloudStorage *self = new qPrefCloudStorage;
@ -113,12 +114,3 @@ void qPrefCloudStorage::disk_userid(bool doSync)
} }
} }
} }
bool qPrefCloudStorage::loadFromCloud(const QString& email)
{
return qPrefPrivate::propValue(QString("loadFromCloud") + email, false).toBool();
}
void qPrefCloudStorage::set_loadFromCloud(const QString& email, bool done)
{
qPrefPrivate::propSetValue(QString("loadFromCloud") + email, done, "");
}

4
core/settings/qPrefCloudStorage.h
View file

@ -45,8 +45,6 @@ public:
static bool save_userid_local() { return prefs.save_userid_local; } static bool save_userid_local() { return prefs.save_userid_local; }
static QString userid() { return prefs.userid; } static QString userid() { return prefs.userid; }
static bool loadFromCloud(const QString& email);
public slots: public slots:
static void set_cloud_base_url(const QString &value); static void set_cloud_base_url(const QString &value);
static void set_cloud_storage_email(const QString &value); static void set_cloud_storage_email(const QString &value);
@ -61,8 +59,6 @@ public slots:
static void set_save_userid_local(bool value); static void set_save_userid_local(bool value);
static void set_userid(const QString &value); static void set_userid(const QString &value);
static void set_loadFromCloud(const QString& email, bool done);
signals: signals:
void cloud_base_url_changed(const QString &value); void cloud_base_url_changed(const QString &value);
void cloud_storage_email_changed(const QString &value); void cloud_storage_email_changed(const QString &value);

14
tests/testqPrefCloudStorage.cpp
View file

@ -266,18 +266,4 @@ void TestQPrefCloudStorage::test_oldPreferences()
TEST(cloud->cloud_verification_status(), 1); TEST(cloud->cloud_verification_status(), 1);
} }
void TestQPrefCloudStorage::test_loadFromCloud_var()
{
auto cloud = qPrefCloudStorage::instance();
cloud->set_loadFromCloud("mail1", true);
cloud->set_loadFromCloud("mail2", false);
cloud->set_loadFromCloud("mail3", true);
QCOMPARE(cloud->loadFromCloud("mail1"), true);
QCOMPARE(cloud->loadFromCloud("mail2"), false);
QCOMPARE(cloud->loadFromCloud("mail3"), true);
QCOMPARE(cloud->loadFromCloud("mail_unknown"), false);
}
QTEST_MAIN(TestQPrefCloudStorage) QTEST_MAIN(TestQPrefCloudStorage)

1
tests/testqPrefCloudStorage.h
View file

@ -15,7 +15,6 @@ private slots:
void test_struct_disk(); void test_struct_disk();
void test_multiple(); void test_multiple();
void test_oldPreferences(); void test_oldPreferences();
void test_loadFromCloud_var();
}; };
#endif // TESTQPREFCLOUDSTORAGE_H #endif // TESTQPREFCLOUDSTORAGE_H