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

2023-04-28 22:25:29 +02:00
parent 30e6180c82
commit d699ce79f7
481 changed files with 2310 additions and 130206 deletions
@@ -7,9 +7,9 @@
 #include <QMap>
 #include "shopsettings.h"
 #include <core.h>
-#include "shopitem.h"
-#include "data/favorititem.h"
-#include "favbutton.h"
+#include "../shopitem.h"
+#include "../data/favorititem.h"
+#include "../favbutton.h"

 namespace Ui {
 class ShopSettingsForm;
@@ -25,10 +25,10 @@ public:

 private:
    Ui::ShopSettingsForm *ui;
-    AutoTableModel<ShopItem> *m_itemModel;
-    int m_favBtnRows;
+    AutoTableModel<IShopItem> *m_itemModel;
+    /*int m_favBtnRows;
    int m_favBtnCols;
-    int m_favBtnSize;
+    int m_favBtnSize;*/
    QMap<QString, FavoritItemPtr> m_btnMap;
    void drawButtons();