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

addressbook/data/addressbookdata.cpp

@@ -1,5 +1,26 @@
+#include <data/countrydata.h>
 #include "addressbookdata.h"
 
+QX_REGISTER_CPP_ADDR(AddressbookData)
+
+namespace qx {
+    template<> void register_class(QxClass<AddressbookData>& t) {
+        t.setName("AddressbookData");
+        t.id(&AddressbookData::m_id, "id");
+        t.data(&AddressbookData::m_title, "title");
+        t.data(&AddressbookData::m_firstName, "firstName");
+        t.data(&AddressbookData::m_lastName, "lastName");
+        t.data(&AddressbookData::m_birthDate, "birthDate");
+        t.data(&AddressbookData::m_idCardNumber, "idCardNumber");
+        t.data(&AddressbookData::m_ztp, "ztp");
+        t.data(&AddressbookData::m_addressCity, "addressCity");
+        t.data(&AddressbookData::m_addressHouseNumber, "addressHouseNumber");
+        t.data(&AddressbookData::m_addressZipCode, "addressZipCode");
+
+        t.relationManyToOne(&AddressbookData::m_country, "country");
+    }
+}
+
 AddressbookData::AddressbookData(QObject * parent)
     :ComboItem(parent)
 {
@@ -96,12 +117,12 @@ void AddressbookData::setAddressZipCode(const QString &addressZipCode)
 {
     m_addressZipCode = addressZipCode;
 }
-int AddressbookData::id() const
+long AddressbookData::id() const
 {
     return m_id;
 }
 
-void AddressbookData::setId(int id)
+void AddressbookData::setId(long id)
 {
     m_id = id;
 }
@@ -122,7 +143,7 @@ void AddressbookData::setCountry(const QSharedPointer<QObject> &country)
 bool AddressbookData::eq(ComboItem *other)
 {
     AddressbookData *adb = qobject_cast<AddressbookData*>(other);
-    return adb != NULL && adb->id() == this->id();
+    return adb != nullptr && adb->id() == this->id();
 }
 
 QString AddressbookData::toString()
@@ -130,4 +151,8 @@ QString AddressbookData::toString()
     return m_lastName + " " + m_firstName + ", " + m_addressStreet + " " + m_addressHouseNumber + ", " + m_addressCity;
 }
 
+QStringList AddressbookData::eagerLoad() {
+    return { "country" };
+}
+