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

camp/campwizard.cpp

@@ -5,7 +5,7 @@
 
 #include <core.h>
 #include <addressbookservice.h>
-#include <accservice.h>
+#include <data/accservice.h>
 #include <reporting/reportviewer.h>
 
 #include <QScroller>
@@ -129,7 +129,7 @@ CampWizard::CampWizard(QWidget *parent) :
 
     Service<AddressbookData> addrSrv;
     m_addrHelperBinder = new ObjectBinder(this);
-    m_addrHelperBinder->registerBinding(ui->address, ComboData::createComboData(addrSrv.all("", "lastName, firstName")));
+    m_addrHelperBinder->registerBinding(ui->address, ComboData::createComboData(addrSrv.all("")));
     m_addrHelperBinder->setData(m_addrHelper);
 
     m_addressBinder = new ObjectBinder(this);
@@ -437,7 +437,7 @@ void CampWizard::accept()
     }
     else
     {
-        srv.updateCamp(m_data);
+        srv.update(m_data);
     }
 
     if (success)
@@ -472,7 +472,7 @@ void CampWizard::on_btnPrint_clicked()
     }
     else
     {
-        srv.updateCamp(m_data);
+        srv.update(m_data);
     }
 
     if(!success)