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

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