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

core/users/tablemodel.h

@@ -1,9 +1,8 @@
 #ifndef TABLEMODEL_H
 #define TABLEMODEL_H
 
-#include "autotablemodel.h"
+#include "../autotablemodel.h"
 #include "../data/core-data.h"
-#include "core-odb.hxx"
 
 class UsersTableModel : public AutoTableModel<User>
 {

core/users/userform.cpp

@@ -20,14 +20,10 @@ UserForm::UserForm(QWidget *parent) :
     registerBinding(ui->name);
     registerBinding(ui->isAdmin);
     registerBinding(ui->active);
-    EmptyStringValidator * esv_login = new EmptyStringValidator(ui->login,"Enter Login Name");
-    registerValidator(esv_login);
-    EmptyStringValidator * esv_password = new EmptyStringValidator(ui->password,"Enter Password");
-    registerValidator(esv_password);
-    EmptyStringValidator * esv_name = new EmptyStringValidator(ui->name,"Enter Name");
-    registerValidator(esv_name);
-    SameStringValidator * ssv_password = new SameStringValidator(ui->password,ui->retypePassword,"Passwords doesen't match");
-    registerValidator(ssv_password);
+    registerValidator(new EmptyStringValidator(ui->login,"Enter Login Name"));
+    registerValidator(new EmptyStringValidator(ui->password,"Enter Password"));
+    registerValidator(new EmptyStringValidator(ui->name,"Enter Name"));
+    registerValidator(new SameStringValidator(ui->password,ui->retypePassword,"Passwords doesen't match"));
 
 }
 
@@ -52,7 +48,7 @@ void UserForm::bindOtherToUi()
        ti = new QTableWidgetItem;
        ti->setText(r->name());
        ti->setCheckState(it == roles.end() ? Qt::Unchecked : Qt::Checked);
-       ti->setData(Qt::UserRole,r->id());
+       ti->setData(Qt::UserRole, (qlonglong)r->id());
        ui->tableWidget->setItem(i,0,ti);
        i++;
    }

core/users/userform.h

@@ -2,9 +2,8 @@
 #define USERFORM_H
 
 #include <QWidget>
-#include "autoform.h"
+#include "../autoform.h"
 #include "../data/core-data.h"
-#include "core-odb.hxx"
 
 namespace Ui {
 class UserForm;

core/users/userform.ui

@@ -14,6 +14,9 @@
    <string>Form</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::ExpandingFieldsGrow</enum>
+   </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">

core/users/users.h

@@ -1,6 +1,6 @@
 #ifndef USERS_H
 #define USERS_H
-#include "imetadataplugin.h"
+#include "../imetadataplugin.h"
 #include "userform.h"
 #include "usersui.h"
 

core/users/usersui.h

@@ -1,9 +1,8 @@
 #ifndef USERSUI_H
 #define USERSUI_H
 
-#include "gridform.h"
+#include "../gridform.h"
 #include "../data/core-data.h"
-#include "core-odb.hxx"
 
 class UsersUi : public GridForm<User>
 {