1 files changed, 40 insertions, 2 deletions

diff --git a/common/clientapi.h b/common/clientapi.h
index 4e55432..06376c2 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -26,11 +26,14 @@
 #include <Async/Async>
 
 #include "query.h"
+#include "inspection.h"
 #include "applicationdomaintype.h"
 
 class QAbstractItemModel;
 
 namespace Akonadi2 {
+class ResourceAccess;
+class Notification;
 
 /**
  * Store interface used in the client API.
@@ -73,6 +76,11 @@ public:
     static KAsync::Job<void> remove(const DomainType &domainObject);
 
     /**
+     * Synchronize data to local cache.
+     */
+    static KAsync::Job<void> synchronize(const Akonadi2::Query &query);
+
+    /**
      * Shutdown resource.
      */
     static KAsync::Job<void> shutdown(const QByteArray &resourceIdentifier);
@@ -87,16 +95,46 @@ public:
     static KAsync::Job<void> start(const QByteArray &resourceIdentifier);
 
     /**
-     * Synchronize data to local cache.
+     * Flushes any pending messages to disk
      */
-    static KAsync::Job<void> synchronize(const Akonadi2::Query &query);
+    static KAsync::Job<void> flushMessageQueue(const QByteArrayList &resourceIdentifier);
+
+    /**
+     * Flushes any pending messages that haven't been replayed to the source.
+     */
+    static KAsync::Job<void> flushReplayQueue(const QByteArrayList &resourceIdentifier);
 
     /**
      * Removes a resource from disk.
      */
     static void removeFromDisk(const QByteArray &resourceIdentifier);
+
+    template <class DomainType>
+    static KAsync::Job<DomainType> fetchOne(const Akonadi2::Query &query);
+
+    template <class DomainType>
+    static KAsync::Job<QList<typename DomainType::Ptr> > fetchAll(const Akonadi2::Query &query);
+
+    template <class DomainType>
+    static KAsync::Job<QList<typename DomainType::Ptr> > fetch(const Akonadi2::Query &query, int minimumAmount = 0);
 };
 
+namespace Resources {
+    template <class DomainType>
+    KAsync::Job<void> inspect(const Inspection &inspectionCommand);
+}
+
+class Notifier {
+public:
+    Notifier(const QSharedPointer<ResourceAccess> &resourceAccess);
+    // Notifier(const QByteArray &resource);
+    // Notifier(const QByteArrayList &resource);
+    void registerHandler(std::function<void(const Notification &)>);
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
 
 }