Move the core files to a core directory

Skarsnik · Dec 17, 2024 · 1ab1c24 · 1ab1c24
1 parent 2997dad
commit 1ab1c24
Show file tree

Hide file tree

Showing 25 changed files with 36 additions and 34 deletions.
diff --git a/QUsb2snes.pro b/QUsb2snes.pro
@@ -59,7 +59,9 @@ equals(QUSB2SNES_NOGUI, 1) {
 
 include($$PWD/devices/EmuNWAccess-qt/EmuNWAccess-qt.pri)
 
-SOURCES += adevice.cpp \
+INCLUDEPATH += core/
+
+SOURCES += core/adevice.cpp \
           devicefactory.cpp \
           devices/sd2snesfactory.cpp \
           devices/snesclassicfactory.cpp \
@@ -79,12 +81,12 @@ SOURCES += adevice.cpp \
           rommapping/rominfo.c \
           devices/sd2snesdevice.cpp \
           devices/snesclassic.cpp \
-          localstorage.cpp \
-          wsserver.cpp \
-          wsservercommands.cpp
+          core/localstorage.cpp \
+          core/wsserver.cpp \
+          core/wsservercommands.cpp
 
-HEADERS += adevice.h \
-          devicefactory.h \
+HEADERS += core/adevice.h \
+          core/devicefactory.h \
           devices/deviceerror.h \
           devices/sd2snesfactory.h \
           devices/snesclassicfactory.h \
@@ -101,9 +103,9 @@ HEADERS += adevice.h \
           devices/sd2snesdevice.h \
           devices/snesclassic.h \
           localstorage.h \
-          usb2snes.h \
+          core/usb2snes.h \
 	  sqpath.h \
-          wsserver.h
+          core/wsserver.h
 
 macx: {
         message("MAC OS BUILD")

diff --git a/QUsb2snes.qbs b/QUsb2snes.qbs
@@ -6,14 +6,14 @@ Project {
     QtApplication {
         name : "QUsb2Snes"
         cpp.cxxLanguageVersion: "c++11"
-        cpp.includePaths: ["devices/EmuNWAccess-qt", "./"]
+        cpp.includePaths: ["devices/EmuNWAccess-qt", "./", "core/"]
         consoleApplication: false
         files: [
             "TODO",
             "devices/EmuNWAccess-qt/emunwaccessclient.cpp",
             "devices/EmuNWAccess-qt/emunwaccessclient.h",
-            "adevice.cpp",
-            "adevice.h",
+            "core/adevice.cpp",
+            "core/adevice.h",
             "sqpath.h",
             "ui/appui.cpp",
             "ui/appuimenu.cpp",
@@ -27,8 +27,8 @@ Project {
             "ui/diagnosticdialog.h",
             "ui/diagnosticdialog.ui",
             "backward.hpp",
-            "devicefactory.cpp",
-            "devicefactory.h",
+            "core/devicefactory.cpp",
+            "core/devicefactory.h",
             "devices/deviceerror.cpp",
             "devices/deviceerror.h",
             "devices/emunetworkaccessdevice.cpp",
@@ -49,8 +49,8 @@ Project {
             "devices/luabridge.h",
             "devices/luabridgedevice.cpp",
             "devices/luabridgedevice.h",
-            "localstorage.cpp",
-            "localstorage.h",
+            "core/localstorage.cpp",
+            "core/localstorage.h",
             "main.cpp",
             "qskarsnikringlist.hpp",
             "qusb2snes.rc",
@@ -86,10 +86,10 @@ Project {
             "ui/wizard/snesclassicpage.cpp",
             "ui/wizard/snesclassicpage.h",
             "ui/wizard/snesclassicpage.ui",
-            "usb2snes.h",
-            "wsserver.cpp",
-            "wsserver.h",
-            "wsservercommands.cpp",
+            "core/usb2snes.h",
+            "core/wsserver.cpp",
+            "core/wsserver.h",
+            "core/wsservercommands.cpp",
         ]
 
         Group {

diff --git a/adevice.cpp → core/adevice.cpp b/adevice.cpp → core/adevice.cpp
diff --git a/adevice.h → core/adevice.h b/adevice.h → core/adevice.h
diff --git a/devicefactory.cpp → core/devicefactory.cpp b/devicefactory.cpp → core/devicefactory.cpp
diff --git a/devicefactory.h → core/devicefactory.h b/devicefactory.h → core/devicefactory.h
diff --git a/localstorage.cpp → core/localstorage.cpp b/localstorage.cpp → core/localstorage.cpp
diff --git a/localstorage.h → core/localstorage.h b/localstorage.h → core/localstorage.h
diff --git a/usb2snes.h → core/usb2snes.h b/usb2snes.h → core/usb2snes.h
diff --git a/wsserver.cpp → core/wsserver.cpp b/wsserver.cpp → core/wsserver.cpp
diff --git a/wsserver.h → core/wsserver.h b/wsserver.h → core/wsserver.h
diff --git a/wsservercommands.cpp → core/wsservercommands.cpp b/wsservercommands.cpp → core/wsservercommands.cpp
diff --git a/devices/emunetworkaccessdevice.h b/devices/emunetworkaccessdevice.h
@@ -26,8 +26,8 @@
 #include <QTimer>
 
 
-#include "../adevice.h"
-#include "../localstorage.h"
+#include "adevice.h"
+#include "localstorage.h"
 #include "emunwaccessclient.h"
 #include "../rommapping/rommapping.h"
 

diff --git a/devices/emunetworkaccessfactory.h b/devices/emunetworkaccessfactory.h
@@ -22,7 +22,7 @@
 #define EMUNETWORKACCESSFACTORY_H
 
 #include <QObject>
-#include "../devicefactory.h"
+#include "devicefactory.h"
 #include "emunetworkaccessdevice.h"
 #include "emunwaccessclient.h"
 

diff --git a/devices/luabridge.h b/devices/luabridge.h
@@ -21,7 +21,7 @@
 #ifndef LUABRIDGE_H
 #define LUABRIDGE_H
 
-#include "../devicefactory.h"
+#include "devicefactory.h"
 #include "luabridgedevice.h"
 #include <QRandomGenerator>
 

diff --git a/devices/luabridgedevice.h b/devices/luabridgedevice.h
@@ -21,7 +21,7 @@
 #ifndef LUABRIDGEDEVICE_H
 #define LUABRIDGEDEVICE_H
 
-#include "../adevice.h"
+#include "adevice.h"
 
 #include <QObject>
 #include <QTcpServer>

diff --git a/devices/retroarchdevice.h b/devices/retroarchdevice.h
@@ -21,7 +21,7 @@
 #ifndef RETROARCHDEVICE_H
 #define RETROARCHDEVICE_H
 
-#include "../adevice.h"
+#include "adevice.h"
 #include "retroarchhost.h"
 #include "../rommapping/rominfo.h"
 

diff --git a/devices/retroarchfactory.h b/devices/retroarchfactory.h
@@ -23,7 +23,7 @@
 
 #include <QObject>
 #include <QUdpSocket>
-#include "../devicefactory.h"
+#include "devicefactory.h"
 #include "retroarchhost.h"
 #include "retroarchdevice.h"
 

diff --git a/devices/sd2snesdevice.h b/devices/sd2snesdevice.h
@@ -25,7 +25,7 @@
 #include <QQueue>
 #include <QSerialPort>
 #include <QVector>
-#include "../adevice.h"
+#include "adevice.h"
 
 class SD2SnesDevice : public ADevice
 {

diff --git a/devices/sd2snesfactory.h b/devices/sd2snesfactory.h
@@ -24,7 +24,7 @@
 #include <QMap>
 #include <QObject>
 
-#include "../devicefactory.h"
+#include "devicefactory.h"
 #include "sd2snesdevice.h"
 
 class SD2SnesFactory : public DeviceFactory

diff --git a/devices/snesclassic.h b/devices/snesclassic.h
@@ -21,7 +21,7 @@
 #ifndef SNESCLASSIC_H
 #define SNESCLASSIC_H
 
-#include "../adevice.h"
+#include "adevice.h"
 
 #include <QObject>
 #include <QTcpSocket>

diff --git a/devices/snesclassicfactory.h b/devices/snesclassicfactory.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QTcpSocket>
 
-#include "../devicefactory.h"
+#include "devicefactory.h"
 
 #include "snesclassic.h"
 

diff --git a/ui/appui.cpp b/ui/appui.cpp
@@ -44,9 +44,9 @@ Q_LOGGING_CATEGORY(log_appUi, "APPUI")
 #define sDebug() qCDebug(log_appUi)
 #define sInfo() qCInfo(log_appUi)
 
-#include "../usb2snes.h"
+//#include "../core/usb2snes.h"
 #include "appui.h"
-#include "../wsserver.h"
+#include "wsserver.h"
 #include "sqpath.h"
 
 

diff --git a/ui/appuimenu.cpp b/ui/appuimenu.cpp
@@ -8,7 +8,7 @@
 #include "appui.h"
 
 #include "diagnosticdialog.h"
-#include "../wsserver.h"
+#include "wsserver.h"
 
 Q_LOGGING_CATEGORY(log_appUiMenu, "APPUIMenu")
 #define sDebug() qCDebug(log_appUiMenu)

diff --git a/ui/diagnosticdialog.h b/ui/diagnosticdialog.h
@@ -1,7 +1,7 @@
 #ifndef DIAGNOSTICDIALOG_H
 #define DIAGNOSTICDIALOG_H
 
-#include "../wsserver.h"
+#include "wsserver.h"
 
 #include <QDialog>