Fixed build on MS VS2010. Improved includes in data classes.

core/data/core-data.h

@@ -0,0 +1,13 @@
+#ifndef COREDATA_H
+#define COREDATA_H
+
+class User;
+class Permission;
+class Role;
+
+#include "user.h"
+#include "role.h"
+#include "permission.h"
+
+#endif // COREDATA_H
+

core/data/permission.h

@@ -1,16 +1,15 @@
 #ifndef PERMISSION_H
 #define PERMISSION_H
 
+#include "core-data.h"
+
 #include <QObject>
-#include "role.h"
 #include <QSharedPointer>
 #include <QList>
 #include <QWeakPointer>
 #include <QDateTime>
 #include <odb/core.hxx>
 
-class Role;
-
 #pragma db object
 class Permission : public QObject
 {

core/data/role.h

@@ -1,18 +1,15 @@
 #ifndef ROLE_H
 #define ROLE_H
 
+#include "core-data.h"
+
 #include <QObject>
-#include "user.h"
-#include "permission.h"
 #include <QSharedPointer>
 #include <QList>
 #include <QWeakPointer>
 #include <QDateTime>
 #include <odb/core.hxx>
 
-class Permission;
-class User;
-
 #pragma db object
 class Role : public QObject
 {

core/data/user.h

@@ -1,17 +1,15 @@
 #ifndef USER_H
 #define USER_H
 
+#include "core-data.h"
+
 #include <QObject>
 #include <QString>
-#include "role.h"
 #include <QSharedPointer>
 #include <QList>
 #include <QDateTime>
-
 #include <odb/core.hxx>
 
-class Role;
-
 #pragma db object
 class User : public QObject
 {