6 files changed, 18 insertions, 17 deletions

diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 1a34443..c931e91 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -82,7 +82,7 @@
 namespace Sink {
 namespace ApplicationDomain {
 
-enum SINK_EXPORT ErrorCode {
+enum ErrorCode {
     NoError = 0,
     UnknownError,
     NoServerError,
@@ -95,11 +95,11 @@ enum SINK_EXPORT ErrorCode {
     ResourceCrashedError
 };
 
-enum SINK_EXPORT SuccessCode {
+enum SuccessCode {
     TransmissionSuccess
 };
 
-enum SINK_EXPORT SyncStatus {
+enum SyncStatus {
     NoSyncStatus,
     SyncInProgress,
     SyncError,
@@ -117,7 +117,7 @@ enum SINK_EXPORT SyncStatus {
  * * If an error occurred that keeps the resource from operating (so non transient), the resource enters the error state.
  * * If a long running operation is started the resource goes to the busy state (and return to the previous state after that).
  */
-enum SINK_EXPORT Status {
+enum Status {
     NoStatus,
     OfflineStatus,
     ConnectedStatus,
diff --git a/common/domain/typeimplementations.h b/common/domain/typeimplementations.h
index 7a8a602..672e83a 100644
--- a/common/domain/typeimplementations.h
+++ b/common/domain/typeimplementations.h
@@ -18,6 +18,7 @@
  */
 #pragma once
 
+#include "sink_export.h"
 #include "applicationdomaintype.h"
 
 #include "mail_generated.h"
@@ -41,7 +42,7 @@ namespace Sink {
 namespace ApplicationDomain {
 
 template<>
-class TypeImplementation<Sink::ApplicationDomain::Mail> {
+class SINK_EXPORT TypeImplementation<Sink::ApplicationDomain::Mail> {
 public:
     typedef Sink::ApplicationDomain::Buffer::Mail Buffer;
     typedef Sink::ApplicationDomain::Buffer::MailBuilder BufferBuilder;
@@ -52,7 +53,7 @@ public:
 };
 
 template<>
-class TypeImplementation<Sink::ApplicationDomain::Folder> {
+class SINK_EXPORT TypeImplementation<Sink::ApplicationDomain::Folder> {
 public:
     typedef Sink::ApplicationDomain::Buffer::Folder Buffer;
     typedef Sink::ApplicationDomain::Buffer::FolderBuilder BufferBuilder;
@@ -63,7 +64,7 @@ public:
 };
 
 template<>
-class TypeImplementation<Sink::ApplicationDomain::Contact> {
+class SINK_EXPORT TypeImplementation<Sink::ApplicationDomain::Contact> {
 public:
     typedef Sink::ApplicationDomain::Buffer::Contact Buffer;
     typedef Sink::ApplicationDomain::Buffer::ContactBuilder BufferBuilder;
@@ -74,7 +75,7 @@ public:
 };
 
 template<>
-class TypeImplementation<Sink::ApplicationDomain::Addressbook> {
+class SINK_EXPORT TypeImplementation<Sink::ApplicationDomain::Addressbook> {
 public:
     typedef Sink::ApplicationDomain::Buffer::Addressbook Buffer;
     typedef Sink::ApplicationDomain::Buffer::AddressbookBuilder BufferBuilder;
@@ -85,7 +86,7 @@ public:
 };
 
 template<>
-class TypeImplementation<Sink::ApplicationDomain::Event> {
+class SINK_EXPORT TypeImplementation<Sink::ApplicationDomain::Event> {
 public:
     typedef Sink::ApplicationDomain::Buffer::Event Buffer;
     typedef Sink::ApplicationDomain::Buffer::EventBuilder BufferBuilder;
@@ -96,7 +97,7 @@ public:
 };
 
 template<>
-class TypeImplementation<Sink::ApplicationDomain::Calendar> {
+class SINK_EXPORT TypeImplementation<Sink::ApplicationDomain::Calendar> {
 public:
     typedef Sink::ApplicationDomain::Buffer::Calendar Buffer;
     typedef Sink::ApplicationDomain::Buffer::CalendarBuilder BufferBuilder;
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index bcfc18d..a5a0ade 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include "sink_export.h"
 #include <QVariant>
 #include <QByteArray>
 #include <functional>
@@ -161,7 +160,7 @@ public:
  * This is required by the facade the read the value, and by the pipeline preprocessors to access the domain values in a generic way.
  */
 template <typename DomainType>
-class SINK_EXPORT DomainTypeAdaptorFactory : public DomainTypeAdaptorFactoryInterface
+class DomainTypeAdaptorFactory : public DomainTypeAdaptorFactoryInterface
 {
     typedef typename Sink::ApplicationDomain::TypeImplementation<DomainType>::Buffer LocalBuffer;
     typedef typename Sink::ApplicationDomain::TypeImplementation<DomainType>::BufferBuilder LocalBuilder;
diff --git a/common/domaintypeadaptorfactoryinterface.h b/common/domaintypeadaptorfactoryinterface.h
index ef42628..ae293f0 100644
--- a/common/domaintypeadaptorfactoryinterface.h
+++ b/common/domaintypeadaptorfactoryinterface.h
@@ -18,6 +18,7 @@
  */
 #pragma once
 
+#include "sink_export.h"
 #include <QSharedPointer>
 
 class TypeIndex;
@@ -33,7 +34,7 @@ namespace flatbuffers {
 class FlatBufferBuilder;
 }
 
-class DomainTypeAdaptorFactoryInterface
+class SINK_EXPORT DomainTypeAdaptorFactoryInterface
 {
 public:
     typedef QSharedPointer<DomainTypeAdaptorFactoryInterface> Ptr;
diff --git a/common/query.h b/common/query.h
index 9030d7c..c33ba2c 100644
--- a/common/query.h
+++ b/common/query.h
@@ -30,7 +30,7 @@ namespace Sink {
 class SINK_EXPORT QueryBase
 {
 public:
-    struct Comparator {
+    struct SINK_EXPORT Comparator {
         enum Comparators {
             Invalid,
             Equals,
@@ -49,7 +49,7 @@ public:
         Comparators comparator;
     };
 
-    class Filter {
+    class SINK_EXPORT Filter {
     public:
         QByteArrayList ids;
         QHash<QByteArray, Comparator> propertyFilter;
diff --git a/common/storage.h b/common/storage.h
index 2451040..bb8c1fa 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -68,7 +68,7 @@ public:
     };
 
     class Transaction;
-    class NamedDatabase
+    class SINK_EXPORT NamedDatabase
     {
     public:
         NamedDatabase();
@@ -142,7 +142,7 @@ public:
         Private *d;
     };
 
-    class Transaction
+    class SINK_EXPORT Transaction
     {
     public:
         Transaction();