diff --git a/src/collectioninterface.h b/src/collectioninterface.h index 838541e69f8c9164dcacfcfd58db5bcbd42eaba6..9d5a4051316940fff304593bbc5f951c934c316d 100644 --- a/src/collectioninterface.h +++ b/src/collectioninterface.h @@ -231,9 +231,6 @@ private: CollectionInterfacePrivate* d_ptr; }; -//The end user of don't care it is an abstract type -typedef CollectionInterface Collection; - #include <collectioninterface.hpp> #endif diff --git a/src/fallbackpersoncollection.cpp b/src/fallbackpersoncollection.cpp index aea16f92d3e4b7c056a7b784a6f9aff69d8e2151..cd069025c4cbbaa02f0de722084d52bc68ee9180 100644 --- a/src/fallbackpersoncollection.cpp +++ b/src/fallbackpersoncollection.cpp @@ -236,7 +236,7 @@ void FallbackPersonCollectionPrivate::loadAsync() QDir d(m_Path); for (const QString& dir : d.entryList(QDir::AllDirs)) { if (dir != QString('.') && dir != "..") { - Collection* col = PersonModel::instance()->addCollection<FallbackPersonCollection,QString,FallbackPersonCollection*>(m_Path+'/'+dir,q_ptr); + CollectionInterface* col = PersonModel::instance()->addCollection<FallbackPersonCollection,QString,FallbackPersonCollection*>(m_Path+'/'+dir,q_ptr); if (ItemModelStateSerializationDelegate::instance()->isChecked(col)) { col->load(); } diff --git a/src/personmodel.cpp b/src/personmodel.cpp index 6e3b5cc9d7ab22cdd5182655088c3c4d637ada29..974969e6d80eee6170c3611ed654e630dc90e9bb 100644 --- a/src/personmodel.cpp +++ b/src/personmodel.cpp @@ -339,7 +339,7 @@ bool PersonModel::addNewPerson(Person* c, CollectionInterface* backend) if (backend) { ret |= backend->editor<Person>()->addNew(c); } - else for (Collection* col :collections(CollectionInterface::SupportedFeatures::ADD)) { + else for (CollectionInterface* col :collections(CollectionInterface::SupportedFeatures::ADD)) { if (col->id() != "trcb") //Do not add to the transitional contact backend ret |= col->editor<Person>()->addNew(c); }