Build system changed to Cmake, ORM changed to QxORM, Qt6 compatibility.

core/data/comboitem.cpp

@@ -1,5 +1,12 @@
 #include "comboitem.h"
 
+QX_REGISTER_CPP_CORE(ComboItem)
+
+namespace qx {
+    template<> void register_class(QxClass<ComboItem>&) {
+    }
+}
+
 ComboItem::ComboItem(QObject *parent)
     :QObject(parent)
 {

core/data/comboitem.h

@@ -1,7 +1,7 @@
 #ifndef COMBOITEM_H
 #define COMBOITEM_H
 
-#include "core_global.h"
+#include "../core_global.h"
 #include <QSharedPointer>
 #include <QVariant>
 #include <QObject>
@@ -18,4 +18,6 @@ public:
     virtual QString toString() = 0;
 };
 
+QX_REGISTER_HPP_CORE(ComboItem, QObject, 0)
+
 #endif // COMBOITEM_H

core/data/core_global.h

@@ -1,12 +0,0 @@
-#ifndef CORE_GLOBAL_H
-#define CORE_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-#if defined(CORE_LIBRARY)
-#  define CORESHARED_EXPORT Q_DECL_EXPORT
-#else
-#  define CORESHARED_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // CORE_GLOBAL_H

core/data/numberseries.cpp

@@ -2,18 +2,32 @@
 #include "../context.h"
 #include "../iplugin.h"
 
+QX_REGISTER_CPP_CORE(NumberSeries)
+
+namespace qx {
+    template<> void register_class(QxClass<NumberSeries>& t) {
+        t.setName("NumberSeries");
+        t.id(&NumberSeries::m_id, "id");
+        t.data(&NumberSeries::m_prefix, "prefix");
+        t.data(&NumberSeries::m_lastNumber, "lastNumber");
+        t.data(&NumberSeries::m_pluginId, "pluginId");
+
+        t.relationManyToOne(&NumberSeries::m_season, "season");
+    }
+}
+
 NumberSeries::NumberSeries(QObject *parent) : QObject(parent)
 {
     m_id = 0;
     m_lastNumber = 0;
 }
 
-int NumberSeries::id() const
+long NumberSeries::id() const
 {
     return m_id;
 }
 
-void NumberSeries::setId(int id)
+void NumberSeries::setId(long id)
 {
     m_id = id;
 }
@@ -71,5 +85,9 @@ QString NumberSeries::seasonName() const
 QString NumberSeries::pluginName() const
 {
     IPlugin *plugin = Context::instance().plugin(m_pluginId);
-    return plugin != NULL ? plugin->pluginName() : "";
+    return plugin != nullptr ? plugin->pluginName() : "";
 }
+
+QStringList NumberSeries::eagerLoad() {
+    return { "season" };
+}

core/data/numberseries.h

@@ -3,16 +3,17 @@
 
 #include <QObject>
 #include <QSharedPointer>
+#include <QStringList>
 
-#include <odb/core.hxx>
+#include <QxOrm.h>
 
 #include "season.h"
-#include "core_global.h"
+#include "../core_global.h"
 
-#pragma db object
 class CORESHARED_EXPORT NumberSeries : public QObject
 {
     Q_OBJECT
+    QX_REGISTER_FRIEND_CLASS(NumberSeries)
     Q_PROPERTY(QString prefix READ prefix WRITE setPrefix)
     Q_PROPERTY(int lastNumber READ lastNumber WRITE setLastNumber)
     Q_PROPERTY(QString pluginName READ pluginName)
@@ -20,8 +21,8 @@ class CORESHARED_EXPORT NumberSeries : public QObject
 public:
     explicit NumberSeries(QObject *parent = 0);
 
-    int id() const;
-    void setId(int id);
+    long id() const;
+    void setId(long id);
 
     QString prefix() const;
     void setPrefix(const QString &prefix);
@@ -39,11 +40,10 @@ public:
 
     QString pluginName() const;
 
-private:
-    friend class odb::access;
+    Q_INVOKABLE QStringList eagerLoad();
 
-#pragma db id auto
-    int m_id;
+private:
+    long m_id;
     QString m_prefix;
     int m_lastNumber;
     QString m_pluginId;
@@ -52,4 +52,6 @@ private:
 
 typedef QSharedPointer<NumberSeries> NumberSeriesPtr;
 
+QX_REGISTER_HPP_CORE(NumberSeries, QObject, 0)
+
 #endif // NUMBERSERIES_H

core/data/permission.cpp

@@ -1,15 +1,31 @@
 #include "permission.h"
 
+QX_REGISTER_CPP_CORE(Permission)
+
+namespace qx {
+    template<> void register_class(QxClass<Permission>& t) {
+        t.setName("Permission");
+        t.id(&Permission::m_id, "id");
+        t.data(&Permission::m_pluginId, "pluginId");
+        t.data(&Permission::m_permissionName, "permissionName");
+        t.data(&Permission::m_lastModDate, "lastModDate");
+        t.data(&Permission::m_createDate, "createDate");
+        t.data(&Permission::m_active, "active");
+
+        t.relationManyToMany(&Permission::m_listRoles, "object_id_fk", "Role_listPermissions", "value", "object_id");
+    }
+}
+
 Permission::Permission(QObject *parent) :
     QObject(parent)
 {
 }
-int Permission::id() const
+long Permission::id() const
 {
     return m_id;
 }
 
-void Permission::setId(int id)
+void Permission::setId(long id)
 {
     m_id = id;
 }
@@ -58,12 +74,12 @@ void Permission::setActive(bool active)
 {
     m_active = active;
 }
-QList<QWeakPointer<Role> > Permission::listRoles() const
+QList<QSharedPointer<Role> > Permission::listRoles() const
 {
     return m_listRoles;
 }
 
-void Permission::setListRoles(const QList<QWeakPointer<Role> > &listRoles)
+void Permission::setListRoles(const QList<QSharedPointer<Role> > &listRoles)
 {
     m_listRoles = listRoles;
 }

core/data/permission.h

@@ -2,30 +2,29 @@
 #define PERMISSION_H
 
 #include "core-data.h"
-#include "core_global.h"
+#include "../core_global.h"
 
 #include <QObject>
 #include <QSharedPointer>
 #include <QList>
 #include <QWeakPointer>
 #include <QDateTime>
-#include <odb/core.hxx>
-#include <odb/qt/list.hxx>
 
-#pragma db object
 class CORESHARED_EXPORT Permission : public QObject
 {
     Q_OBJECT
+
+    QX_REGISTER_FRIEND_CLASS(Permission)
     Q_PROPERTY(QString pluginId READ pluginId WRITE setPluginId)
     Q_PROPERTY(QString permissionName READ permissionName WRITE setPermissionName)
     Q_PROPERTY(QDateTime lastModDate READ lastModDate WRITE setLastModDate)
     Q_PROPERTY(QDateTime createDate READ createDate WRITE setCreateDate)
     Q_PROPERTY(bool active READ active WRITE setActive)
 public:
-    explicit Permission(QObject *parent = 0);
+    explicit Permission(QObject *parent = nullptr);
 
-    int id() const;
-    void setId(int id);
+    long id() const;
+    void setId(long id);
 
     QString pluginId() const;
     void setPluginId(const QString &pluginId);
@@ -42,24 +41,22 @@ public:
     bool active() const;
     void setActive(bool active);
 
-    QList<QWeakPointer<Role> > listRoles() const;
-    void setListRoles(const QList<QWeakPointer<Role> > &listRoles);
+    QList<QSharedPointer<Role>> listRoles() const;
+    void setListRoles(const QList<QSharedPointer<Role>> &listRoles);
 
     void addRole(QSharedPointer<Role> role);
 
 private:
-    friend class odb::access;
-
-#pragma db id auto
-    int m_id;
+    long m_id;
     QString m_pluginId;
     QString m_permissionName;
     QDateTime m_lastModDate;
     QDateTime m_createDate;
     bool m_active;
-#pragma db value_not_null inverse(m_listPermissions)
-    QOdbList<QWeakPointer<Role> > m_listRoles;
+    QList<QSharedPointer<Role>> m_listRoles;
 
 };
 
+QX_REGISTER_HPP_CORE(Permission, QObject, 0)
+
 #endif // PERMISSION_H

core/data/role.cpp

@@ -1,15 +1,32 @@
 #include "role.h"
 
+QX_REGISTER_CPP_CORE(Role)
+
+namespace qx {
+    template<> void register_class(QxClass<Role>& t) {
+        t.setName("Role");
+        t.id(&Role::m_id, "id");
+        t.data(&Role::m_name, "name");
+        t.data(&Role::m_lastModDate, "lastModDate");
+        t.data(&Role::m_createDate, "createDate");
+        t.data(&Role::m_active, "active");
+
+        t.relationManyToMany(&Role::m_listPermissions, "object_id_fk", "Role_listPermissions", "object_id", "value");
+        t.relationManyToMany(&Role::m_listUsers, "value_fk", "User_listRoles", "value", "object_id");
+    }
+}
+
 Role::Role(QObject *parent) :
     QObject(parent)
 {
 }
-int Role::id() const
+
+long Role::id() const
 {
     return m_id;
 }
 
-void Role::setId(int id)
+void Role::setId(long id)
 {
     m_id = id;
 }
@@ -49,12 +66,12 @@ void Role::setActive(bool active)
 {
     m_active = active;
 }
-QList<QWeakPointer<User> > Role::listUsers() const
+QList<QSharedPointer<User> > Role::listUsers() const
 {
     return m_listUsers;
 }
 
-void Role::setListUsers(const QList<QWeakPointer<User> > &listUsers)
+void Role::setListUsers(const QList<QSharedPointer<User> > &listUsers)
 {
     m_listUsers = listUsers;
 }

core/data/role.h

@@ -2,20 +2,19 @@
 #define ROLE_H
 
 #include "core-data.h"
-#include "core_global.h"
+#include "../core_global.h"
 
 #include <QObject>
 #include <QSharedPointer>
 #include <QList>
 #include <QWeakPointer>
 #include <QDateTime>
-#include <odb/core.hxx>
-#include <odb/qt/list.hxx>
 
-#pragma db object
 class CORESHARED_EXPORT Role : public QObject
 {
     Q_OBJECT
+
+    QX_REGISTER_FRIEND_CLASS(Role)
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(QDateTime lastModDate READ lastModDate WRITE setLastModDate)
     Q_PROPERTY(QDateTime createDate READ createDate WRITE setCreateDate)
@@ -23,8 +22,8 @@ class CORESHARED_EXPORT Role : public QObject
 public:
     explicit Role(QObject *parent = 0);
 
-    int id() const;
-    void setId(int id);
+    long id() const;
+    void setId(long id);
 
     QString name() const;
     void setName(const QString &name);
@@ -38,8 +37,8 @@ public:
     bool active() const;
     void setActive(bool active);
 
-    QList<QWeakPointer<User> > listUsers() const;
-    void setListUsers(const QList<QWeakPointer<User> > &listUsers);
+    QList<QSharedPointer<User> > listUsers() const;
+    void setListUsers(const QList<QSharedPointer<User> > &listUsers);
 
     QList<QSharedPointer<Permission> > listPermissions() const;
     void setListPermissions(const QList<QSharedPointer<Permission> > &listPermissions);
@@ -48,18 +47,15 @@ public:
     void clearPermissions();
 
 private:
-    friend class odb::access;
-
-#pragma db id auto
-    int m_id;
+    long m_id;
     QString m_name;
     QDateTime m_lastModDate;
     QDateTime m_createDate;
     bool m_active;
-#pragma db value_not_null inverse(m_listRoles)
-    QOdbList<QWeakPointer<User> > m_listUsers;
-#pragma db value_not_null
-    QOdbList<QSharedPointer<Permission> > m_listPermissions;
+    QList<QSharedPointer<User> > m_listUsers;
+    QList<QSharedPointer<Permission> > m_listPermissions;
 };
 
+QX_REGISTER_HPP_CORE(Role, QObject, 0)
+
 #endif // ROLE_H

core/data/season.cpp

@@ -1,5 +1,18 @@
 #include "season.h"
 
+QX_REGISTER_CPP_CORE(Season)
+
+namespace qx {
+    template <> void register_class(QxClass<Season> & t)
+    {
+        t.setName("Season");
+        t.id(& Season::m_id, "id");
+        t.data(& Season::m_name, "name");
+        t.data(& Season::m_validFrom, "validFrom");
+        t.data(& Season::m_validTo, "validTo");
+        t.data(& Season::m_active, "active");
+    }}
+
 Season::Season(QObject *parent)
     :QObject(parent)
 {
@@ -47,12 +60,12 @@ void Season::setActive(bool active)
     m_active = active;
 }
 
-int Season::id() const
+long Season::id() const
 {
     return m_id;
 }
 
-void Season::setId(int id)
+void Season::setId(long id)
 {
     m_id = id;
 }

core/data/season.h

@@ -1,24 +1,23 @@
 #ifndef SEASON_H
 #define SEASON_H
 
-#include "core_global.h"
+#include "../core_global.h"
 
 #include <QObject>
 #include <QString>
 #include <QDate>
 
-#include <odb/core.hxx>
-
-#pragma db object
 class CORESHARED_EXPORT Season : public QObject
 {
     Q_OBJECT
+    QX_REGISTER_FRIEND_CLASS(Season)
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(QDate validFrom READ validFrom WRITE setValidFrom)
     Q_PROPERTY(QDate validTo READ validTo WRITE setValidTo)
     Q_PROPERTY(bool active READ active WRITE setActive)
+
 public:
-    explicit Season(QObject *parent = 0);
+    explicit Season(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &name);
@@ -32,14 +31,11 @@ public:
     bool active() const;
     void setActive(bool active);
 
-    int id() const;
-    void setId(int id);
+    long id() const;
+    void setId(long id);
 
 private:
-    friend class odb::access;
-
-#pragma db id auto
-    int m_id;
+    long m_id;
     QString m_name;
     QDate m_validFrom;
     QDate m_validTo;
@@ -48,4 +44,7 @@ private:
 
 typedef QSharedPointer<Season> SeasonPtr;
 
+QX_REGISTER_HPP_CORE(Season, QObject, 0)
+
+
 #endif // SEASON_H

core/data/system.cpp

@@ -1,4 +1,17 @@
 #include "system.h"
+#include <QxOrm_Impl.h>
+
+QX_REGISTER_CPP_CORE(System)
+
+namespace qx {
+    template <> void register_class(QxClass<System> & t)
+    {
+        t.setName("system");
+        t.id(& System::m_id, "id");
+        t.data(& System::m_pluginId, "pluginId");
+        t.data(& System::m_schemaVersion, "schemaVersion");
+        t.data(& System::m_settings, "settings");
+    }}
 
 System::System()
 {
@@ -10,12 +23,12 @@ System::~System()
 
 }
 
-int System::id() const
+long System::id() const
 {
     return m_id;
 }
 
-void System::setId(int id)
+void System::setId(long id)
 {
     m_id = id;
 }

core/data/system.h

@@ -1,20 +1,18 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-#include "core_global.h"
+#include "../core_global.h"
 #include <QString>
 
-#include <odb/core.hxx>
-
-#pragma db object
 class CORESHARED_EXPORT System
 {
+    QX_REGISTER_FRIEND_CLASS(System)
 public:
     System();
     virtual ~System();
 
-    int id() const;
-    void setId(int id);
+    long id() const;
+    void setId(long id);
 
     QString pluginId() const;
 
@@ -24,13 +22,12 @@ public:
     void setSettings(const QString &settings);
 
 private:
-    friend class odb::access;
-
-#pragma db id auto
-    int m_id;
+    long m_id;
     QString m_pluginId;
     QString m_schemaVersion;
     QString m_settings;
 };
 
+QX_REGISTER_HPP_CORE(System, qx::trait::no_base_class_defined, 0);
+
 #endif // SYSTEM_H

core/data/user.cpp

@@ -1,14 +1,29 @@
 #include "user.h"
 
-User::User()
-{
+QX_REGISTER_CPP_CORE(User)
+
+namespace qx {
+    template<> void register_class(QxClass<User>& t) {
+        t.setName("User");
+        t.id(&User::m_id, "id");
+        t.data(&User::m_login, "login");
+        t.data(&User::m_password, "password");
+        t.data(&User::m_name, "name");
+        t.data(&User::m_lastModDate, "lastModDate");
+        t.data(&User::m_createDate, "createDate");
+        t.data(&User::m_active, "active");
+        t.data(&User::m_isAdmin, "isAdmin");
+
+        t.relationManyToMany(&User::m_listRoles, "object_id_fk", "User_listRoles", "object_id", "value");
+    }
 }
-int User::id() const
+
+long User::id() const
 {
     return m_id;
 }
 
-void User::setId(int id)
+void User::setId(long id)
 {
     m_id = id;
 }

core/data/user.h

@@ -2,20 +2,19 @@
 #define USER_H
 
 #include "core-data.h"
-#include "core_global.h"
+#include "../core_global.h"
 
 #include <QObject>
 #include <QString>
 #include <QSharedPointer>
 #include <QList>
 #include <QDateTime>
-#include <odb/core.hxx>
-#include <odb/qt/list.hxx>
 
-#pragma db object
 class CORESHARED_EXPORT User : public QObject
 {
     Q_OBJECT
+
+    QX_REGISTER_FRIEND_CLASS(User)
     Q_PROPERTY(QString login READ login WRITE setLogin)
     Q_PROPERTY(QString password READ password WRITE setPassword)
     Q_PROPERTY(QString name READ name WRITE setName)
@@ -25,11 +24,10 @@ class CORESHARED_EXPORT User : public QObject
     Q_PROPERTY(QDateTime createDate READ createDate WRITE setCreateDate)
 
 public:
-    User();
+    User() = default;
 
-
-    int id() const;
-    void setId(int id);
+    long id() const;
+    void setId(long id);
 
     QString login() const;
     void setLogin(const QString &login);
@@ -61,10 +59,7 @@ public:
 
 
 private:
-    friend class odb::access;
-
-#pragma db id auto
-    int m_id;
+    long m_id;
     QString m_login;
     QString m_password;
     QString m_name;
@@ -72,8 +67,9 @@ private:
     QDateTime m_createDate;
     bool m_active;
     bool m_isAdmin;
-#pragma db value_not_null
-    QOdbList<QSharedPointer<Role> > m_listRoles;
+    QList<QSharedPointer<Role> > m_listRoles;
 };
 
+QX_REGISTER_HPP_CORE(User, QObject, 0)
+
 #endif // USER_H