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

core/roles/roles.h

@@ -1,7 +1,7 @@
 #ifndef ROLES_H
 #define ROLES_H
 
-#include "imetadataplugin.h"
+#include "../imetadataplugin.h"
 
 class Roles : public IMetaDataPlugin
 {

core/roles/rolesform.cpp

@@ -1,7 +1,7 @@
 #include "rolesform.h"
 #include "ui_rolesform.h"
-#include "iplugin.h"
-#include "permissionservice.h"
+#include "../iplugin.h"
+#include "../permissionservice.h"
 
 #include <QTreeWidgetItem>
 

core/roles/rolesform.h

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

core/roles/rolesform.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>542</width>
-    <height>270</height>
+    <width>556</width>
+    <height>291</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,7 +15,7 @@
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
-    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+    <enum>QFormLayout::ExpandingFieldsGrow</enum>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label">

core/roles/rolestablemodel.h

@@ -1,8 +1,8 @@
 #ifndef ROLESTABLEMODEL_H
 #define ROLESTABLEMODEL_H
 
-#include "autotablemodel.h"
-#include "data/core-data.h"
+#include "../autotablemodel.h"
+#include "../data/core-data.h"
 
 class RolesTableModel : public AutoTableModel<Role>
 {

core/roles/rolesui.h

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