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/entitystorage.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'common/entitystorage.h')

diff --git a/common/entitystorage.h b/common/entitystorage.h
index 516a889..2fce880 100644
--- a/common/entitystorage.h
+++ b/common/entitystorage.h
@@ -18,15 +18,16 @@
  */
 #pragma once
 
-#include "clientapi.h"
-
 #include <QByteArray>
 
+#include "query.h"
 #include "domainadaptor.h"
 #include "entitybuffer.h"
 #include "log.h"
 #include "storage.h"
 #include "resultset.h"
+#include "resultprovider.h"
+#include "definitions.h"
 
 /**
  * Wraps storage, entity adaptor factory and indexes into one.
@@ -85,7 +86,7 @@ public:
 
     virtual void read(const Akonadi2::Query &query, const QPair<qint64, qint64> &revisionRange, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider) 
     {
-        Akonadi2::Storage storage(Akonadi2::Store::storageLocation(), mResourceInstanceIdentifier);
+        Akonadi2::Storage storage(Akonadi2::storageLocation(), mResourceInstanceIdentifier);
         storage.setDefaultErrorHandler([](const Akonadi2::Storage::Error &error) {
             Warning() << "Error during query: " << error.store << error.message;
         });
-- 
cgit v1.2.3