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

commodity/data/commoditydata.cpp

@@ -1,22 +1,40 @@
 #include "commoditydata.h"
 #include <define.h>
 
+QX_REGISTER_CPP_COMM(CommodityData)
+
+namespace qx {
+    template<> void register_class(QxClass<CommodityData>& t) {
+        t.setName("CommodityData");
+        t.id(&CommodityData::m_id, "id");
+        t.data(&CommodityData::m_name, "name");
+        t.data(&CommodityData::m_shortName, "shortName");
+        t.data(&CommodityData::m_code, "code");
+        t.data(&CommodityData::m_price, "price");
+        t.data(&CommodityData::m_vat, "vat");
+        t.data(&CommodityData::m_count, "count");
+
+        t.relationManyToOne(&CommodityData::m_type, "type");
+    }
+}
+
 CommodityData::CommodityData(QObject *parent)
-    :ShopItem(parent)
+    :IShopItem(parent)
 {
     m_count = 0;
     m_price = 0;
     m_vat = Enums::NONE;
 }
-int CommodityData::id()
+long CommodityData::id()
 {
     return m_id;
 }
 
-void CommodityData::setId(int id)
+void CommodityData::setId(long id)
 {
     m_id = id;
 }
+
 QString CommodityData::name()
 {
     return m_name;
@@ -26,6 +44,7 @@ void CommodityData::setName(const QString &name)
 {
     m_name = name;
 }
+
 QString CommodityData::shortName()
 {
     return m_shortName;
@@ -35,6 +54,7 @@ void CommodityData::setShortName(const QString &shortName)
 {
     m_shortName = shortName;
 }
+
 QString CommodityData::code() const
 {
     return m_code;
@@ -44,6 +64,7 @@ void CommodityData::setCode(const QString &code)
 {
     m_code = code;
 }
+
 QSharedPointer<QObject> CommodityData::type() const
 {
     return m_type;
@@ -51,7 +72,7 @@ QSharedPointer<QObject> CommodityData::type() const
 
 void CommodityData::setType(const QSharedPointer<QObject> &type)
 {
-    if (qobject_cast<CommodityTypeData*>(type.data()) != NULL) {
+    if (qobject_cast<CommodityTypeData*>(type.data()) != nullptr) {
         m_type = qSharedPointerDynamicCast<CommodityTypeData, QObject>(type);
     }
 }
@@ -98,6 +119,10 @@ QString CommodityData::pluginId()
     return "COMMODITY";
 }
 
+QStringList CommodityData::eagerLoad() {
+    return { "type" };
+}
+