clean up

cfrankb · Sep 10, 2023 · 5725774 · 5725774
1 parent c807a2e
commit 5725774
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,4 +70,4 @@ Thumbs.db
 # --------
 *.dll
 *.exe
-
+.vscode/*
diff --git a/gamemixin.cpp b/gamemixin.cpp
@@ -1,7 +1,7 @@
 #include "gamemixin.h"
 #include "tilesdata.h"
-#include "FrameSet.h"
-#include "Frame.h"
+#include "shared/FrameSet.h"
+#include "shared/Frame.h"
 #include "map.h"
 #include "game.h"
 #include "maparch.h"

diff --git a/gamemixin.h b/gamemixin.h
@@ -1,7 +1,11 @@
 #ifndef CGAMEMIXIN_H
 #define CGAMEMIXIN_H
 
+#ifdef USE_QFILE
 #include <QTimer>
+#endif
+#include <cstdint>
+
 class CFrameSet;
 class CGame;
 class CFrame;
@@ -15,7 +19,9 @@ class CGameMixin
     virtual ~CGameMixin();
     void init(CMapArch *maparch, int index);
 
+#ifdef USE_QFILE
 protected slots:
+#endif
     void mainLoop();
     void changeZoom();
 

diff --git a/shared/ss_version.h b/shared/ss_version.h
diff --git a/shared/stdafx.h b/shared/stdafx.h