6 files changed, 13 insertions, 12 deletions

diff --git a/common/domain/event.h b/common/domain/event.h
index 68c684a..38020f8 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -33,8 +33,8 @@ namespace Akonadi2 {
 
 namespace ApplicationDomain {
     namespace Buffer {
-        class Event;
-        class EventBuilder;
+        struct Event;
+        struct EventBuilder;
     }
 
 /**
diff --git a/common/entitybuffer.h b/common/entitybuffer.h
index 82152c9..dd7588e 100644
--- a/common/entitybuffer.h
+++ b/common/entitybuffer.h
@@ -4,7 +4,7 @@
 #include <flatbuffers/flatbuffers.h>
 
 namespace Akonadi2 {
-class Entity;
+struct Entity;
 
 class EntityBuffer {
 public:
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index fdc8b14..b6485d7 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -157,8 +157,8 @@ GenericResource::GenericResource(const QByteArray &resourceInstanceIdentifier)
     : Akonadi2::Resource(),
     mUserQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", "org.kde." + resourceInstanceIdentifier + ".userqueue"),
     mSynchronizerQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", "org.kde." + resourceInstanceIdentifier + ".synchronizerqueue"),
-    mError(0),
-    mResourceInstanceIdentifier(resourceInstanceIdentifier)
+    mResourceInstanceIdentifier(resourceInstanceIdentifier),
+    mError(0)
 {
 }
 
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 249dd55..038e240 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -41,7 +41,7 @@
 namespace Akonadi2
 {
 
-class QueuedCommand
+struct QueuedCommand
 {
 public:
     QueuedCommand(int commandId, const std::function<void(int, const QString &)> &callback)
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index b779db9..de58525 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -31,7 +31,7 @@
 namespace Akonadi2
 {
 
-class QueuedCommand;
+struct QueuedCommand;
 
 class ResourceAccess : public QObject
 {
diff --git a/common/resultset.h b/common/resultset.h
index 33f3c68..1a19100 100644
--- a/common/resultset.h
+++ b/common/resultset.h
@@ -32,15 +32,15 @@ class ResultSet {
 
 
         ResultSet(const std::function<bool(std::function<void(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &)>)> &generator)
-            : mValueGenerator(generator),
-            mIt(nullptr)
+            : mIt(nullptr),
+            mValueGenerator(generator)
         {
 
         }
 
         ResultSet(const std::function<QByteArray()> &generator)
-            : mGenerator(generator),
-            mIt(nullptr)
+            : mIt(nullptr),
+            mGenerator(generator)
         {
 
         }
@@ -64,6 +64,7 @@ class ResultSet {
                 }
                 return mIt != mResultSet.constEnd();
             }
+            return false;
         }
 
         bool next(std::function<bool(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value)> callback)
@@ -84,7 +85,7 @@ class ResultSet {
                 }
                 return mIt != mResultSet.constEnd();
             }
-
+            return false;
         }
 
         QByteArray id()