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

print
Josef Rokos 9 years ago
parent 1439502c20
commit 1264b2547a

@ -16,7 +16,7 @@ SOURCES += \
context.cpp \
imetadataplugin.cpp \
transaction.cpp \
emptystringvalidator.cpp
emptystringvalidator.cpp \
data/role.cpp \
data/permission.cpp
@ -31,15 +31,17 @@ HEADERS += core.h\
autoform.h \
transaction.h \
ivalidator.h \
emptystringvalidator.h
emptystringvalidator.h \
data/role.h \
data/permission.h
data/permission.h \
data/core-data.h
unix {
target.path = /usr/lib
INSTALLS += target
}
ODB_FILES = core/data/user.h core/data/role.h core/data/permission.h
ODB_FILES = core/data/core-data.h
H_DIR = $$PWD/data/*.h
include(../odb.pri)

@ -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

@ -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
{

@ -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
{

@ -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
{

@ -4,7 +4,9 @@
#include <QString>
#include "ivalidator.h"
class EmptyStringValidator : public IValidator
#include "core_global.h"
class CORESHARED_EXPORT EmptyStringValidator : public IValidator
{
public:
EmptyStringValidator(QWidget *widget, const QString &errMessage);

@ -4,7 +4,9 @@
#include <QWidget>
#include <QString>
class IValidator
#include "core_global.h"
class CORESHARED_EXPORT IValidator
{
public:
IValidator(QWidget *widget, const QString &errMessage)

@ -4,7 +4,9 @@
#include <odb/database.hxx>
#include <odb/transaction.hxx>
class Transaction
#include "core_global.h"
class CORESHARED_EXPORT Transaction
{
public:
Transaction();

Loading…
Cancel
Save