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

commodity/commodityservice.cpp

@@ -1,18 +1,11 @@
 #include "commodityservice.h"
 
-#include "commodity-odb.hxx"
-
-CommodityService::CommodityService()
+QList<QSharedPointer<IShopItem> > CommodityService::shopItems()
 {
-
-}
-
-QList<QSharedPointer<ShopItem> > CommodityService::shopItems()
-{
-    QList<QSharedPointer<ShopItem> > ret;
+    QList<QSharedPointer<IShopItem> > ret;
 
     foreach (QSharedPointer<CommodityData> data, all()) {
-        ret.append(qSharedPointerDynamicCast<ShopItem, CommodityData>(data));
+        ret.append(qSharedPointerDynamicCast<IShopItem, CommodityData>(data));
     }
 
     return ret;
@@ -30,15 +23,15 @@ void CommodityService::addedToVoucher(int itemId, int countAdded)
     update(commodity);
 }
 
-ShopItemPtr CommodityService::shopItem(int itemId)
+IShopItemPtr CommodityService::shopItem(int itemId)
 {
     CommodityDataPtr item = this->loadById(itemId);
-    return qSharedPointerDynamicCast<ShopItem, CommodityData>(item);
+    return qSharedPointerDynamicCast<IShopItem, CommodityData>(item);
 }
 
 ISeller *CommodityService::seller()
 {
-    return NULL;
+    return nullptr;
 }
 
 QString CommodityService::defaultSort()