Cleanup.

8 files changed, 11 insertions, 35 deletions

diff --git a/common/genericresource.h b/common/genericresource.h
index d34a361..017d6bc 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -20,8 +20,8 @@
 #pragma once
 
 #include "sink_export.h"
-#include <resource.h>
-#include <resourcecontext.h>
+#include "resource.h"
+#include "resourcecontext.h"
 
 namespace Sink {
 class Pipeline;
@@ -35,6 +35,7 @@ class CommandProcessor;
  */
 class SINK_EXPORT GenericResource : public Resource
 {
+    Q_OBJECT
 public:
     GenericResource(const Sink::ResourceContext &context, const QSharedPointer<Pipeline> &pipeline = QSharedPointer<Pipeline>());
     virtual ~GenericResource() Q_DECL_OVERRIDE;
diff --git a/common/resource.h b/common/resource.h
index 1b0b388..2c33c0c 100644
--- a/common/resource.h
+++ b/common/resource.h
@@ -64,6 +64,7 @@ private:
  */
 class SINK_EXPORT ResourceFactory : public QObject
 {
+    Q_OBJECT
 public:
     static ResourceFactory *load(const QByteArray &resourceName);
 
@@ -83,4 +84,4 @@ private:
 
 } // namespace Sink
 
-Q_DECLARE_INTERFACE(Sink::ResourceFactory, "sink.sink.resourcefactory")
+Q_DECLARE_INTERFACE(Sink::ResourceFactory, "sink.resourcefactory")
diff --git a/examples/caldavresource/caldavresource.h b/examples/caldavresource/caldavresource.h
index 5822495..79f438f 100644
--- a/examples/caldavresource/caldavresource.h
+++ b/examples/caldavresource/caldavresource.h
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include "common/resource.h"
 #include "common/genericresource.h"
 
 /**
diff --git a/examples/carddavresource/carddavresource.h b/examples/carddavresource/carddavresource.h
index 3c0f707..6238736 100644
--- a/examples/carddavresource/carddavresource.h
+++ b/examples/carddavresource/carddavresource.h
@@ -19,16 +19,9 @@
 
 #pragma once
 
+#include "common/resource.h"
 #include "common/genericresource.h"
 
-#include <KDAV2/DavUrl>
-#include <KAsync/Async>
-
-#include <flatbuffers/flatbuffers.h>
-
-class ContactAdaptorFactory;
-class AddressbookAdaptorFactory;
-
 /**
  * A CardDAV resource.
  *
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index cfc6577..0e13696 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -19,12 +19,8 @@
 
 #pragma once
 
+#include "common/resource.h"
 #include "common/genericresource.h"
-#include "common/messagequeue.h"
-
-#include <KAsync/Async>
-
-#include <flatbuffers/flatbuffers.h>
 
 class DummyResource : public Sink::GenericResource
 {
diff --git a/examples/imapresource/imapresource.h b/examples/imapresource/imapresource.h
index 3b8b670..8a6bb59 100644
--- a/examples/imapresource/imapresource.h
+++ b/examples/imapresource/imapresource.h
@@ -19,20 +19,9 @@
 
 #pragma once
 
+#include "common/resource.h"
 #include "common/genericresource.h"
 
-#include <KAsync/Async>
-
-#include <flatbuffers/flatbuffers.h>
-
-class ImapMailAdaptorFactory;
-class ImapFolderAdaptorFactory;
-
-namespace Imap {
-struct Message;
-struct Folder;
-}
-
 /**
  * An imap resource.
  */
diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h
index 8ceb2f5..538ea0b 100644
--- a/examples/maildirresource/maildirresource.h
+++ b/examples/maildirresource/maildirresource.h
@@ -19,15 +19,9 @@
 
 #pragma once
 
+#include "common/resource.h"
 #include "common/genericresource.h"
 
-#include <KAsync/Async>
-
-#include <flatbuffers/flatbuffers.h>
-
-class MaildirMailAdaptorFactory;
-class MaildirFolderAdaptorFactory;
-
 /**
  * A maildir resource.
  * 
diff --git a/tests/upgradetest.cpp b/tests/upgradetest.cpp
index 1060626..0b150e7 100644
--- a/tests/upgradetest.cpp
+++ b/tests/upgradetest.cpp
@@ -10,6 +10,7 @@
 #include "test.h"
 #include "testutils.h"
 #include "definitions.h"
+#include "storage.h"
 
 using namespace Sink;
 using namespace Sink::ApplicationDomain;