diff --git a/src/domain/datasource.h b/src/domain/datasource.h --- a/src/domain/datasource.h +++ b/src/domain/datasource.h @@ -48,7 +48,6 @@ enum ContentType { NoContent = 0, Tasks, - Notes }; Q_DECLARE_FLAGS(ContentTypes, ContentType) diff --git a/tests/units/akonadi/akonadiserializertest.cpp b/tests/units/akonadi/akonadiserializertest.cpp --- a/tests/units/akonadi/akonadiserializertest.cpp +++ b/tests/units/akonadi/akonadiserializertest.cpp @@ -324,17 +324,12 @@ const auto noType = Domain::DataSource::ContentTypes(Domain::DataSource::NoContent); const auto taskType = Domain::DataSource::ContentTypes(Domain::DataSource::Tasks); - const auto noteType = Domain::DataSource::ContentTypes(Domain::DataSource::Notes); - const auto allTypes = taskType | noteType; - QTest::newRow("nominal case") << "name" << "icon-name" << allTypes << true; - - QTest::newRow("only notes") << "name" << "icon-name" << noteType << true; QTest::newRow("only tasks") << "name" << "icon-name" << taskType << true; QTest::newRow("only nothing ;)") << "name" << "icon-name" << noType << true; - QTest::newRow("not selected") << "name" << "icon-name" << allTypes << false; - QTest::newRow("selected") << "name" << "icon-name" << allTypes << true; + QTest::newRow("not selected") << "name" << "icon-name" << taskType << false; + QTest::newRow("selected") << "name" << "icon-name" << taskType << true; QTest::newRow("empty case") << QString() << QString() << noType << true; } @@ -353,8 +348,6 @@ QStringList mimeTypes; if (contentTypes & Domain::DataSource::Tasks) mimeTypes << QStringLiteral("application/x-vnd.akonadi.calendar.todo"); - if (contentTypes & Domain::DataSource::Notes) - mimeTypes << QStringLiteral("text/x-vnd.akonadi.note"); // ... stored in a data source @@ -411,9 +404,6 @@ QFETCH(bool, isSelected); Domain::DataSource::ContentTypes expectedContentTypes; - if (mimeTypes.contains(QStringLiteral("text/x-vnd.akonadi.note"))) { - expectedContentTypes |= Domain::DataSource::Notes; - } if (mimeTypes.contains(QStringLiteral("application/x-vnd.akonadi.calendar.todo"))) { expectedContentTypes |= Domain::DataSource::Tasks; } diff --git a/tests/units/domain/datasourcetest.cpp b/tests/units/domain/datasourcetest.cpp --- a/tests/units/domain/datasourcetest.cpp +++ b/tests/units/domain/datasourcetest.cpp @@ -87,18 +87,18 @@ { DataSource ds; QSignalSpy spy(&ds, &DataSource::contentTypesChanged); - ds.setContentTypes(Domain::DataSource::Notes); + ds.setContentTypes(Domain::DataSource::Tasks); QCOMPARE(spy.count(), 1); QCOMPARE(spy.first().first().value(), - Domain::DataSource::Notes); + Domain::DataSource::Tasks); } void shouldNotNotifyIdenticalContentTypesChanges() { DataSource ds; - ds.setContentTypes(Domain::DataSource::Notes); + ds.setContentTypes(Domain::DataSource::Tasks); QSignalSpy spy(&ds, &DataSource::contentTypesChanged); - ds.setContentTypes(Domain::DataSource::Notes); + ds.setContentTypes(Domain::DataSource::Tasks); QCOMPARE(spy.count(), 0); } diff --git a/tests/units/presentation/availablesourcesmodeltest.cpp b/tests/units/presentation/availablesourcesmodeltest.cpp --- a/tests/units/presentation/availablesourcesmodeltest.cpp +++ b/tests/units/presentation/availablesourcesmodeltest.cpp @@ -85,11 +85,11 @@ auto source3 = Domain::DataSource::Ptr::create(); source3->setName(QStringLiteral("Source 3")); source3->setSelected(false); - source3->setContentTypes(Domain::DataSource::Notes); + source3->setContentTypes(Domain::DataSource::Tasks); auto source4 = Domain::DataSource::Ptr::create(); source4->setSelected(true); source4->setName(QStringLiteral("Source 4")); - source4->setContentTypes(Domain::DataSource::Notes | Domain::DataSource::Tasks); + source4->setContentTypes(Domain::DataSource::Tasks); auto source1Provider = Domain::QueryResultProvider::Ptr::create(); auto source1Result = Domain::QueryResult::create(source1Provider); source1Provider->append(source3);