2 files changed, 44 insertions, 41 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index 73bc194..e6878a6 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -160,7 +160,7 @@ KAsync::Job<void> Store::remove(const DomainType &domainObject)
     });
 }
 
-KAsync::Job<void> Store::shutdown(const QByteArray &identifier)
+KAsync::Job<void> Resources::shutdown(const QByteArray &identifier)
 {
     Trace() << "shutdown " << identifier;
     auto time = QSharedPointer<QTime>::create();
@@ -183,7 +183,7 @@ KAsync::Job<void> Store::shutdown(const QByteArray &identifier)
     .template then<void>([](){});
 }
 
-KAsync::Job<void> Store::start(const QByteArray &identifier)
+KAsync::Job<void> Resources::start(const QByteArray &identifier)
 {
     Trace() << "start " << identifier;
     auto time = QSharedPointer<QTime>::create();
@@ -231,7 +231,7 @@ KAsync::Job<void> Store::synchronize(const Sink::Query &query)
     .template then<void>([](){});
 }
 
-KAsync::Job<void> Store::flushMessageQueue(const QByteArrayList &resourceIdentifier)
+KAsync::Job<void> Resources::flushMessageQueue(const QByteArrayList &resourceIdentifier)
 {
     Trace() << "flushMessageQueue" << resourceIdentifier;
     return KAsync::iterate(resourceIdentifier)
@@ -247,7 +247,7 @@ KAsync::Job<void> Store::flushMessageQueue(const QByteArrayList &resourceIdentif
     .template then<void>([](){});
 }
 
-KAsync::Job<void> Store::flushReplayQueue(const QByteArrayList &resourceIdentifier)
+KAsync::Job<void> Resources::flushReplayQueue(const QByteArrayList &resourceIdentifier)
 {
     return flushMessageQueue(resourceIdentifier);
 }
diff --git a/common/clientapi.h b/common/clientapi.h
index 19d42e0..36c923b 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -36,6 +36,19 @@ namespace Sink {
 class ResourceAccess;
 class Notification;
 
+class SINKCOMMON_EXPORT Notifier {
+public:
+    Notifier(const QSharedPointer<ResourceAccess> &resourceAccess);
+    Notifier(const QByteArray &resourceInstanceIdentifier);
+    // Notifier(const QByteArrayList &resource);
+    void registerHandler(std::function<void(const Notification &)>);
+
+private:
+    class Private;
+    QSharedPointer<Private> d;
+};
+
+
 /**
  * Store interface used in the client API.
  */
@@ -82,30 +95,6 @@ public:
     static KAsync::Job<void> synchronize(const Sink::Query &query);
 
     /**
-     * Shutdown resource.
-     */
-    static KAsync::Job<void> shutdown(const QByteArray &resourceIdentifier);
-
-    /**
-     * Start resource.
-     * 
-     * The resource is ready for operation once this command completes.
-     * This command is only necessary if a resource was shutdown previously,
-     * otherwise the resource process will automatically start as necessary.
-     */
-    static KAsync::Job<void> start(const QByteArray &resourceIdentifier);
-
-    /**
-     * Flushes any pending messages to disk
-     */
-    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);
@@ -128,21 +117,35 @@ public:
 };
 
 namespace Resources {
-    template <class DomainType>
-    KAsync::Job<void> SINKCOMMON_EXPORT inspect(const Inspection &inspectionCommand);
-}
 
-class SINKCOMMON_EXPORT Notifier {
-public:
-    Notifier(const QSharedPointer<ResourceAccess> &resourceAccess);
-    Notifier(const QByteArray &resourceInstanceIdentifier);
-    // Notifier(const QByteArrayList &resource);
-    void registerHandler(std::function<void(const Notification &)>);
+template <class DomainType>
+KAsync::Job<void> SINKCOMMON_EXPORT inspect(const Inspection &inspectionCommand);
 
-private:
-    class Private;
-    QSharedPointer<Private> d;
-};
+/**
+    * Shutdown resource.
+    */
+KAsync::Job<void> SINKCOMMON_EXPORT shutdown(const QByteArray &resourceIdentifier);
+
+/**
+    * Start resource.
+    * 
+    * The resource is ready for operation once this command completes.
+    * This command is only necessary if a resource was shutdown previously,
+    * otherwise the resource process will automatically start as necessary.
+    */
+KAsync::Job<void> SINKCOMMON_EXPORT start(const QByteArray &resourceIdentifier);
+
+/**
+    * Flushes any pending messages to disk
+    */
+KAsync::Job<void> SINKCOMMON_EXPORT flushMessageQueue(const QByteArrayList &resourceIdentifier);
+
+/**
+    * Flushes any pending messages that haven't been replayed to the source.
+    */
+KAsync::Job<void> SINKCOMMON_EXPORT flushReplayQueue(const QByteArrayList &resourceIdentifier);
+
+}
 
 }