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

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