repo restruct

Odizinne · Nov 6, 2024 · 42a1308 · 42a1308
1 parent 10f4c48
commit 42a1308
Show file tree

Hide file tree

Showing 35 changed files with 31 additions and 30 deletions.
diff --git a/HeadsetControl-Qt.pro b/HeadsetControl-Qt.pro
@@ -9,39 +9,39 @@ CONFIG += c++17
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 INCLUDEPATH += \
-    src/ShortcutManager \
-    src/HeadsetControlQt \
-    src/Utils \
-    src/Worker
+    ShortcutManager \
+    HeadsetControlQt \
+    Utils \
+    Worker
 
 SOURCES += \
-    src/ShortcutManager/shortcutmanager.cpp \
-    src/Worker/worker.cpp \
-    src/main.cpp \
-    src/HeadsetControlQt/headsetcontrolqt.cpp \
-    src/Utils/utils.cpp
+    ShortcutManager/ShortcutManager.cpp \
+    Worker/Worker.cpp \
+    main.cpp \
+    HeadsetControlQt/HeadsetControlQt.cpp \
+    Utils/Utils.cpp
 
 HEADERS += \
-    src/ShortcutManager/shortcutmanager.h \
-    src/HeadsetControlQt/headsetcontrolqt.h \
-    src/Utils/utils.h \
-    src/Worker/worker.h
+    ShortcutManager/ShortcutManager.h \
+    HeadsetControlQt/HeadsetControlQt.h \
+    Utils/Utils.h \
+    Worker/Worker.h
 
 FORMS += \
-    src/HeadsetControlQt/headsetcontrolqt.ui
+    HeadsetControlQt/HeadsetControlQt.ui
 
 TRANSLATIONS += \
-    src/Resources/tr/HeadsetControl-Qt_fr.ts \
-    src/Resources/tr/HeadsetControl-Qt_en.ts \
-    src/Resources/tr/HeadsetControl-Qt_hu.ts \
-    src/Resources/tr/HeadsetControl-Qt_es.ts \
-    src/Resources/tr/HeadsetControl-Qt_de.ts \
-    src/Resources/tr/HeadsetControl-Qt_it.ts
+    Resources/tr/HeadsetControl-Qt_fr.ts \
+    Resources/tr/HeadsetControl-Qt_en.ts \
+    Resources/tr/HeadsetControl-Qt_hu.ts \
+    Resources/tr/HeadsetControl-Qt_es.ts \
+    Resources/tr/HeadsetControl-Qt_de.ts \
+    Resources/tr/HeadsetControl-Qt_it.ts
 
 RESOURCES += \
-    src/Resources/resources.qrc
+    Resources/resources.qrc
 
-RC_FILE = src/Resources/appicon.rc
+RC_FILE = Resources/appicon.rc
 
 # Build/embed translations automatically
 CONFIG += lrelease

diff --git a/src/HeadsetControlQt/headsetcontrolqt.h → HeadsetControlQt/HeadsetControlQt.h b/src/HeadsetControlQt/headsetcontrolqt.h → HeadsetControlQt/HeadsetControlQt.h
@@ -1,14 +1,14 @@
 #ifndef HEADSETCONTROLQT_H
 #define HEADSETCONTROLQT_H
 
+#include "Worker.h"
 #include <QMainWindow>
 #include <QSystemTrayIcon>
 #include <QMenu>
 #include <QAction>
 #include <QTimer>
 #include <QCloseEvent>
 #include <QThread>
-#include "worker.h"
 #include <QSettings>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/HeadsetControlQt/headsetcontrolqt.ui → HeadsetControlQt/HeadsetControlQt.ui b/src/HeadsetControlQt/headsetcontrolqt.ui → HeadsetControlQt/HeadsetControlQt.ui
diff --git a/src/HeadsetControlQt/headsetcontrolqt.cpp → HeadsetControlQt/headsetcontrolqt.cpp b/src/HeadsetControlQt/headsetcontrolqt.cpp → HeadsetControlQt/headsetcontrolqt.cpp
@@ -1,7 +1,7 @@
-#include "headsetcontrolqt.h"
-#include "ui_headsetcontrolqt.h"
-#include "utils.h"
-#include "shortcutmanager.h"
+#include "HeadsetControlQt.h"
+#include "ui_HeadsetControlQt.h"
+#include "Utils.h"
+#include "ShortcutManager.h"
 #include <QIcon>
 #include <QJsonDocument>
 #include <QJsonObject>

diff --git a/src/Resources/appicon.rc → Resources/appicon.rc b/src/Resources/appicon.rc → Resources/appicon.rc
diff --git a/src/Resources/icons/battery-020-dark.png → Resources/icons/battery-020-dark.png b/src/Resources/icons/battery-020-dark.png → Resources/icons/battery-020-dark.png
diff --git a/src/Resources/icons/battery-020-light.png → Resources/icons/battery-020-light.png b/src/Resources/icons/battery-020-light.png → Resources/icons/battery-020-light.png
diff --git a/src/Resources/icons/battery-040-dark.png → Resources/icons/battery-040-dark.png b/src/Resources/icons/battery-040-dark.png → Resources/icons/battery-040-dark.png
diff --git a/src/Resources/icons/battery-040-light.png → Resources/icons/battery-040-light.png b/src/Resources/icons/battery-040-light.png → Resources/icons/battery-040-light.png
diff --git a/src/Resources/icons/battery-060-dark.png → Resources/icons/battery-060-dark.png b/src/Resources/icons/battery-060-dark.png → Resources/icons/battery-060-dark.png
diff --git a/src/Resources/icons/battery-060-light.png → Resources/icons/battery-060-light.png b/src/Resources/icons/battery-060-light.png → Resources/icons/battery-060-light.png
diff --git a/src/Resources/icons/battery-080-dark.png → Resources/icons/battery-080-dark.png b/src/Resources/icons/battery-080-dark.png → Resources/icons/battery-080-dark.png
diff --git a/src/Resources/icons/battery-080-light.png → Resources/icons/battery-080-light.png b/src/Resources/icons/battery-080-light.png → Resources/icons/battery-080-light.png
diff --git a/...urces/icons/battery-100-charging-dark.png → ...urces/icons/battery-100-charging-dark.png b/...urces/icons/battery-100-charging-dark.png → ...urces/icons/battery-100-charging-dark.png
diff --git a/...rces/icons/battery-100-charging-light.png → ...rces/icons/battery-100-charging-light.png b/...rces/icons/battery-100-charging-light.png → ...rces/icons/battery-100-charging-light.png
diff --git a/src/Resources/icons/battery-100-dark.png → Resources/icons/battery-100-dark.png b/src/Resources/icons/battery-100-dark.png → Resources/icons/battery-100-dark.png
diff --git a/src/Resources/icons/battery-100-light.png → Resources/icons/battery-100-light.png b/src/Resources/icons/battery-100-light.png → Resources/icons/battery-100-light.png
diff --git a/src/Resources/icons/battery-missing-dark.png → Resources/icons/battery-missing-dark.png b/src/Resources/icons/battery-missing-dark.png → Resources/icons/battery-missing-dark.png
diff --git a/...Resources/icons/battery-missing-light.png → Resources/icons/battery-missing-light.png b/...Resources/icons/battery-missing-light.png → Resources/icons/battery-missing-light.png
diff --git a/src/Resources/icons/icon.ico → Resources/icons/icon.ico b/src/Resources/icons/icon.ico → Resources/icons/icon.ico
diff --git a/src/Resources/icons/icon.png → Resources/icons/icon.png b/src/Resources/icons/icon.png → Resources/icons/icon.png
diff --git a/src/Resources/resources.qrc → Resources/resources.qrc b/src/Resources/resources.qrc → Resources/resources.qrc
diff --git a/src/Resources/tr/HeadsetControl-Qt_de.ts → Resources/tr/HeadsetControl-Qt_de.ts b/src/Resources/tr/HeadsetControl-Qt_de.ts → Resources/tr/HeadsetControl-Qt_de.ts
diff --git a/src/Resources/tr/HeadsetControl-Qt_en.ts → Resources/tr/HeadsetControl-Qt_en.ts b/src/Resources/tr/HeadsetControl-Qt_en.ts → Resources/tr/HeadsetControl-Qt_en.ts
diff --git a/src/Resources/tr/HeadsetControl-Qt_es.ts → Resources/tr/HeadsetControl-Qt_es.ts b/src/Resources/tr/HeadsetControl-Qt_es.ts → Resources/tr/HeadsetControl-Qt_es.ts
diff --git a/src/Resources/tr/HeadsetControl-Qt_fr.ts → Resources/tr/HeadsetControl-Qt_fr.ts b/src/Resources/tr/HeadsetControl-Qt_fr.ts → Resources/tr/HeadsetControl-Qt_fr.ts
diff --git a/src/Resources/tr/HeadsetControl-Qt_hu.ts → Resources/tr/HeadsetControl-Qt_hu.ts b/src/Resources/tr/HeadsetControl-Qt_hu.ts → Resources/tr/HeadsetControl-Qt_hu.ts
diff --git a/src/Resources/tr/HeadsetControl-Qt_it.ts → Resources/tr/HeadsetControl-Qt_it.ts b/src/Resources/tr/HeadsetControl-Qt_it.ts → Resources/tr/HeadsetControl-Qt_it.ts
diff --git a/src/ShortcutManager/shortcutmanager.cpp → ShortcutManager/ShortcutManager.cpp b/src/ShortcutManager/shortcutmanager.cpp → ShortcutManager/ShortcutManager.cpp
diff --git a/src/ShortcutManager/shortcutmanager.h → ShortcutManager/ShortcutManager.h b/src/ShortcutManager/shortcutmanager.h → ShortcutManager/ShortcutManager.h
diff --git a/src/Utils/utils.h → Utils/Utils.h b/src/Utils/utils.h → Utils/Utils.h
@@ -1,5 +1,6 @@
 #ifndef UTILS_H
 #define UTILS_H
+
 #include <QIcon>
 #include <QString>
 #include <QFrame>

diff --git a/src/Utils/utils.cpp → Utils/utils.cpp b/src/Utils/utils.cpp → Utils/utils.cpp
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "Utils.h"
 #include <QDir>
 #include <QFile>
 #include <QProcess>

diff --git a/src/Worker/worker.h → Worker/Worker.h b/src/Worker/worker.h → Worker/Worker.h
diff --git a/src/Worker/worker.cpp → Worker/worker.cpp b/src/Worker/worker.cpp → Worker/worker.cpp
@@ -1,4 +1,4 @@
-#include "worker.h"
+#include "Worker.h"
 #include <QProcess>
 #include <QJsonDocument>
 

diff --git a/src/main.cpp → main.cpp b/src/main.cpp → main.cpp
@@ -1,4 +1,4 @@
-#include "headsetcontrolqt.h"
+#include "HeadsetControlQt.h"
 #include <QApplication>
 
 int main(int argc, char *argv[])