Commit eafd265e authored by Volker Krause's avatar Volker Krause
Browse files

Adjust to namespace fixes in kdepimlibs.

parent 52dabdd7
......@@ -367,7 +367,7 @@ protected:
const QModelIndex sourceIndex = sourceModel()->index(row, 0, sourceParent);
Q_ASSERT(sourceIndex.isValid());
const Akonadi::Collection &col = sourceIndex.data(Akonadi::EntityTreeModel::CollectionRole).value<Akonadi::Collection>();
CollectionIdentificationAttribute *attr = col.attribute<CollectionIdentificationAttribute>();
Akonadi::CollectionIdentificationAttribute *attr = col.attribute<Akonadi::CollectionIdentificationAttribute>();
//We filter the user folders because we insert person nodes for user folders.
if ((attr && attr->collectionNamespace().startsWith("usertoplevel"))
|| col.name().contains(QStringLiteral("Other Users"))) {
......
......@@ -234,7 +234,7 @@ KPIM::Person PersonNodeManager::person(const QModelIndex &sourceIndex)
KPIM::Person person;
const Akonadi::Collection col = sourceIndex.data(Akonadi::EntityTreeModel::CollectionRole).value<Akonadi::Collection>();
if (col.isValid()) {
CollectionIdentificationAttribute *attr = col.attribute<CollectionIdentificationAttribute>();
Akonadi::CollectionIdentificationAttribute *attr = col.attribute<Akonadi::CollectionIdentificationAttribute>();
if (attr && attr->collectionNamespace() == "usertoplevel") {
person.name = col.displayName();
person.mail = QString::fromUtf8(attr->mail());
......@@ -277,7 +277,7 @@ Controller::Controller(ReparentingModel *personModel, ReparentingModel *searchMo
mCollectionSearchJob(0),
mPersonSearchJob(0)
{
Akonadi::AttributeFactory::registerAttribute<CollectionIdentificationAttribute>();
Akonadi::AttributeFactory::registerAttribute<Akonadi::CollectionIdentificationAttribute>();
}
void Controller::setSearchString(const QString &searchString)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment