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

camp/settings/campsettings.cpp

@@ -8,6 +8,8 @@ CampSettings::CampSettings(QObject *parent) : QObject(parent)
     m_rounding = Enums::R_MATH;
     m_decimalPlaces = 0;
     m_vatType = Enums::NONE;
+    m_accFeeStartAge = 0;
+    m_accFeeEndAge = 0;
 }
 
 QDecDouble CampSettings::accFee() const

camp/settings/campsettings.h

@@ -18,7 +18,7 @@ class CampSettings : public QObject
     Q_PROPERTY(QString accFeeText READ accFeeText WRITE setAccFeeText)
 
 public:
-    explicit CampSettings(QObject *parent = 0);
+    explicit CampSettings(QObject *parent = nullptr);
 
     QDecDouble accFee() const;
     void setAccFee(QDecDouble accFee);

camp/settings/campsettingsform.cpp

@@ -1,10 +1,10 @@
-#include "camp-odb.hxx"
 #include "campsettingsform.h"
 #include "ui_campsettingsform.h"
 
 #include <settingsservice.h>
 #include <QScroller>
 #include <QMessageBox>
+#include <QHeaderView>
 
 CampSettingsForm::CampSettingsForm(QWidget *parent) :
     FormBinder<CampSettings>(parent),

camp/settings/campsettingsform.h

@@ -5,7 +5,7 @@
 #include <QList>
 
 #include "campsettings.h"
-#include "data/camp-data.h"
+#include "../data/camp-data.h"
 #include <formbinder.h>
 #include <autotablemodel.h>
 
@@ -18,16 +18,16 @@ class CampSettingsForm : public FormBinder<CampSettings>
     Q_OBJECT
 
 public:
-    explicit CampSettingsForm(QWidget *parent = 0);
-    ~CampSettingsForm();
+    explicit CampSettingsForm(QWidget *parent = nullptr);
+    ~CampSettingsForm() override;
 
     // IForm interface
 public slots:
-    bool saveRecord();
+    bool saveRecord() override;
 
     // IForm interface
 public:
-    void loadEntity();
+    void loadEntity() override;
 
 private slots:
     void on_btnPriceAdd_clicked();