From b6d5d206de4d02149c6530236154283bf834087a Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 13 Aug 2015 01:27:21 +0200
Subject: Untangled the include dependencies a bit.

We no longer depend on clientapi.h from everywhere.
---
 common/domain/event.cpp | 6 ++++--
 common/domain/event.h   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'common/domain')

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index d86ac16..15f5d11 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -27,6 +27,8 @@
 #include "../storage.h"
 #include "../log.h"
 #include "../propertymapper.h"
+#include "../query.h"
+#include "../definitions.h"
 
 #include "event_generated.h"
 
@@ -36,7 +38,7 @@ ResultSet TypeImplementation<Event>::queryIndexes(const Akonadi2::Query &query,
 {
     QVector<QByteArray> keys;
     if (query.propertyFilter.contains("uid")) {
-        Index uidIndex(Akonadi2::Store::storageLocation(), resourceInstanceIdentifier + ".index.uid", Akonadi2::Storage::ReadOnly);
+        Index uidIndex(Akonadi2::storageLocation(), resourceInstanceIdentifier + ".index.uid", Akonadi2::Storage::ReadOnly);
         uidIndex.lookup(query.propertyFilter.value("uid").toByteArray(), [&](const QByteArray &value) {
             keys << value;
         },
@@ -50,7 +52,7 @@ ResultSet TypeImplementation<Event>::queryIndexes(const Akonadi2::Query &query,
 
 void TypeImplementation<Event>::index(const Event &type)
 {
-    Index uidIndex(Akonadi2::Store::storageLocation(), type.resourceInstanceIdentifier() + ".index.uid", Akonadi2::Storage::ReadWrite);
+    Index uidIndex(Akonadi2::storageLocation(), type.resourceInstanceIdentifier() + ".index.uid", Akonadi2::Storage::ReadWrite);
     const auto uid = type.getProperty("uid");
     if (uid.isValid()) {
         uidIndex.add(uid.toByteArray(), type.identifier());
diff --git a/common/domain/event.h b/common/domain/event.h
index 38020f8..13cfc6e 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include "../clientapi.h"
+#include "applicationdomaintype.h"
 
 class ResultSet;
 class QByteArray;
-- 
cgit v1.2.3