diff --git a/src/akonadi/akonadistoragesettings.h b/src/akonadi/akonadistoragesettings.h --- a/src/akonadi/akonadistoragesettings.h +++ b/src/akonadi/akonadistoragesettings.h @@ -39,17 +39,14 @@ public: static StorageSettings &instance(); - Akonadi::Collection::List activeCollections(); Akonadi::Collection defaultNoteCollection(); Akonadi::Collection defaultTaskCollection(); public slots: - void setActiveCollections(const Akonadi::Collection::List &collections); void setDefaultNoteCollection(const Akonadi::Collection &collection); void setDefaultTaskCollection(const Akonadi::Collection &collection); signals: - void activeCollectionsChanged(const Akonadi::Collection::List &collections); void defaultNoteCollectionChanged(const Akonadi::Collection &collection); void defaultTaskCollectionChanged(const Akonadi::Collection &collection); }; diff --git a/src/akonadi/akonadistoragesettings.cpp b/src/akonadi/akonadistoragesettings.cpp --- a/src/akonadi/akonadistoragesettings.cpp +++ b/src/akonadi/akonadistoragesettings.cpp @@ -39,18 +39,6 @@ return i; } -Collection::List StorageSettings::activeCollections() -{ - KConfigGroup config(KSharedConfig::openConfig(), "General"); - QList ids = config.readEntry("activeCollections", QList()); - Collection::List list; - list.reserve(ids.size()); - foreach (const auto &id, ids) { - list << Collection(id); - } - return list; -} - Collection StorageSettings::defaultNoteCollection() { KConfigGroup config(KSharedConfig::openConfig(), "General"); @@ -86,19 +74,3 @@ config.sync(); emit defaultTaskCollectionChanged(collection); } - -void StorageSettings::setActiveCollections(const Collection::List &collections) -{ - if (activeCollections() == collections) - return; - - QList ids; - for (const auto &col : collections) { - ids << col.id(); - } - - KConfigGroup config(KSharedConfig::openConfig(), "General"); - config.writeEntry("activeCollections", ids); - config.sync(); - emit activeCollectionsChanged(collections); -} diff --git a/tests/units/akonadi/akonadistoragesettingstest.cpp b/tests/units/akonadi/akonadistoragesettingstest.cpp --- a/tests/units/akonadi/akonadistoragesettingstest.cpp +++ b/tests/units/akonadi/akonadistoragesettingstest.cpp @@ -81,12 +81,10 @@ // WHEN g.writeEntry("defaultCollection", i); g.writeEntry("defaultNoteCollection", i + 1); - g.writeEntry("activeCollections", idList(i + 2)); // THEN QCOMPARE(StorageSettings::instance().defaultTaskCollection(), Collection(i)); QCOMPARE(StorageSettings::instance().defaultNoteCollection(), Collection(i + 1)); - QCOMPARE(StorageSettings::instance().activeCollections(), colList(i + 2)); } } @@ -100,12 +98,10 @@ // WHEN StorageSettings::instance().setDefaultTaskCollection(Collection(i)); StorageSettings::instance().setDefaultNoteCollection(Collection(i + 1)); - StorageSettings::instance().setActiveCollections(colList(i + 2)); // THEN QCOMPARE(g.readEntry("defaultCollection", -1), i); QCOMPARE(g.readEntry("defaultNoteCollection", -1), i + 1); - QCOMPARE(g.readEntry("activeCollections", QList()), idList(i + 2)); } } @@ -144,24 +140,6 @@ settings.setDefaultNoteCollection(Collection(4)); QCOMPARE(spy.count(), 0); } - - void shouldNotifyActiveCollectionsChanges() - { - StorageSettings &settings = StorageSettings::instance(); - QSignalSpy spy(&settings, &Akonadi::StorageSettings::activeCollectionsChanged); - settings.setActiveCollections(colList(2)); - QCOMPARE(spy.count(), 1); - QCOMPARE(spy.first().first().value(), colList(2)); - } - - void shouldNotNotifyIdenticalActiveCollectionsChanges() - { - StorageSettings &settings = StorageSettings::instance(); - settings.setActiveCollections(colList(4)); - QSignalSpy spy(&settings, &Akonadi::StorageSettings::activeCollectionsChanged); - settings.setActiveCollections(colList(4)); - QCOMPARE(spy.count(), 0); - } }; ZANSHIN_TEST_MAIN(AkonadiStorageSettingsTest)