From 9dd20a18182ccb7ab47955e35d1fae76a27ffd9f Mon Sep 17 00:00:00 2001 From: Odizinne Date: Wed, 6 Nov 2024 22:02:21 +0100 Subject: [PATCH] repo restruct --- HeadsetControl-Qt.pro | 44 +++++++++--------- .../HeadsetControlQt.cpp | 8 ++-- .../HeadsetControlQt.h | 2 +- .../HeadsetControlQt.ui | 0 {src/Resources => Resources}/appicon.rc | 0 .../icons/battery-020-dark.png | Bin .../icons/battery-020-light.png | Bin .../icons/battery-040-dark.png | Bin .../icons/battery-040-light.png | Bin .../icons/battery-060-dark.png | Bin .../icons/battery-060-light.png | Bin .../icons/battery-080-dark.png | Bin .../icons/battery-080-light.png | Bin .../icons/battery-100-charging-dark.png | Bin .../icons/battery-100-charging-light.png | Bin .../icons/battery-100-dark.png | Bin .../icons/battery-100-light.png | Bin .../icons/battery-missing-dark.png | Bin .../icons/battery-missing-light.png | Bin {src/Resources => Resources}/icons/icon.ico | Bin {src/Resources => Resources}/icons/icon.png | Bin {src/Resources => Resources}/resources.qrc | 0 .../tr/HeadsetControl-Qt_de.ts | 0 .../tr/HeadsetControl-Qt_en.ts | 0 .../tr/HeadsetControl-Qt_es.ts | 0 .../tr/HeadsetControl-Qt_fr.ts | 0 .../tr/HeadsetControl-Qt_hu.ts | 0 .../tr/HeadsetControl-Qt_it.ts | 0 .../ShortcutManager.cpp | 0 .../ShortcutManager.h | 0 src/Utils/utils.cpp => Utils/Utils.cpp | 2 +- src/Utils/utils.h => Utils/Utils.h | 1 + src/Worker/worker.cpp => Worker/Worker.cpp | 2 +- src/Worker/worker.h => Worker/Worker.h | 0 src/main.cpp => main.cpp | 2 +- 35 files changed, 31 insertions(+), 30 deletions(-) rename src/HeadsetControlQt/headsetcontrolqt.cpp => HeadsetControlQt/HeadsetControlQt.cpp (99%) rename src/HeadsetControlQt/headsetcontrolqt.h => HeadsetControlQt/HeadsetControlQt.h (99%) rename src/HeadsetControlQt/headsetcontrolqt.ui => HeadsetControlQt/HeadsetControlQt.ui (100%) rename {src/Resources => Resources}/appicon.rc (100%) rename {src/Resources => Resources}/icons/battery-020-dark.png (100%) rename {src/Resources => Resources}/icons/battery-020-light.png (100%) rename {src/Resources => Resources}/icons/battery-040-dark.png (100%) rename {src/Resources => Resources}/icons/battery-040-light.png (100%) rename {src/Resources => Resources}/icons/battery-060-dark.png (100%) rename {src/Resources => Resources}/icons/battery-060-light.png (100%) rename {src/Resources => Resources}/icons/battery-080-dark.png (100%) rename {src/Resources => Resources}/icons/battery-080-light.png (100%) rename {src/Resources => Resources}/icons/battery-100-charging-dark.png (100%) rename {src/Resources => Resources}/icons/battery-100-charging-light.png (100%) rename {src/Resources => Resources}/icons/battery-100-dark.png (100%) rename {src/Resources => Resources}/icons/battery-100-light.png (100%) rename {src/Resources => Resources}/icons/battery-missing-dark.png (100%) rename {src/Resources => Resources}/icons/battery-missing-light.png (100%) rename {src/Resources => Resources}/icons/icon.ico (100%) rename {src/Resources => Resources}/icons/icon.png (100%) rename {src/Resources => Resources}/resources.qrc (100%) rename {src/Resources => Resources}/tr/HeadsetControl-Qt_de.ts (100%) rename {src/Resources => Resources}/tr/HeadsetControl-Qt_en.ts (100%) rename {src/Resources => Resources}/tr/HeadsetControl-Qt_es.ts (100%) rename {src/Resources => Resources}/tr/HeadsetControl-Qt_fr.ts (100%) rename {src/Resources => Resources}/tr/HeadsetControl-Qt_hu.ts (100%) rename {src/Resources => Resources}/tr/HeadsetControl-Qt_it.ts (100%) rename src/ShortcutManager/shortcutmanager.cpp => ShortcutManager/ShortcutManager.cpp (100%) rename src/ShortcutManager/shortcutmanager.h => ShortcutManager/ShortcutManager.h (100%) rename src/Utils/utils.cpp => Utils/Utils.cpp (99%) rename src/Utils/utils.h => Utils/Utils.h (99%) rename src/Worker/worker.cpp => Worker/Worker.cpp (98%) rename src/Worker/worker.h => Worker/Worker.h (100%) rename src/main.cpp => main.cpp (88%) diff --git a/HeadsetControl-Qt.pro b/HeadsetControl-Qt.pro index c18e29a..2729f89 100644 --- 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.cpp b/HeadsetControlQt/HeadsetControlQt.cpp similarity index 99% rename from src/HeadsetControlQt/headsetcontrolqt.cpp rename to HeadsetControlQt/HeadsetControlQt.cpp index d0738ca..b5fc76c 100644 --- a/src/HeadsetControlQt/headsetcontrolqt.cpp +++ b/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 #include #include diff --git a/src/HeadsetControlQt/headsetcontrolqt.h b/HeadsetControlQt/HeadsetControlQt.h similarity index 99% rename from src/HeadsetControlQt/headsetcontrolqt.h rename to HeadsetControlQt/HeadsetControlQt.h index 8a50630..0a8fa14 100644 --- a/src/HeadsetControlQt/headsetcontrolqt.h +++ b/HeadsetControlQt/HeadsetControlQt.h @@ -1,6 +1,7 @@ #ifndef HEADSETCONTROLQT_H #define HEADSETCONTROLQT_H +#include "Worker.h" #include #include #include @@ -8,7 +9,6 @@ #include #include #include -#include "worker.h" #include QT_BEGIN_NAMESPACE diff --git a/src/HeadsetControlQt/headsetcontrolqt.ui b/HeadsetControlQt/HeadsetControlQt.ui similarity index 100% rename from src/HeadsetControlQt/headsetcontrolqt.ui rename to HeadsetControlQt/HeadsetControlQt.ui diff --git a/src/Resources/appicon.rc b/Resources/appicon.rc similarity index 100% rename from src/Resources/appicon.rc rename to Resources/appicon.rc diff --git a/src/Resources/icons/battery-020-dark.png b/Resources/icons/battery-020-dark.png similarity index 100% rename from src/Resources/icons/battery-020-dark.png rename to Resources/icons/battery-020-dark.png diff --git a/src/Resources/icons/battery-020-light.png b/Resources/icons/battery-020-light.png similarity index 100% rename from src/Resources/icons/battery-020-light.png rename to Resources/icons/battery-020-light.png diff --git a/src/Resources/icons/battery-040-dark.png b/Resources/icons/battery-040-dark.png similarity index 100% rename from src/Resources/icons/battery-040-dark.png rename to Resources/icons/battery-040-dark.png diff --git a/src/Resources/icons/battery-040-light.png b/Resources/icons/battery-040-light.png similarity index 100% rename from src/Resources/icons/battery-040-light.png rename to Resources/icons/battery-040-light.png diff --git a/src/Resources/icons/battery-060-dark.png b/Resources/icons/battery-060-dark.png similarity index 100% rename from src/Resources/icons/battery-060-dark.png rename to Resources/icons/battery-060-dark.png diff --git a/src/Resources/icons/battery-060-light.png b/Resources/icons/battery-060-light.png similarity index 100% rename from src/Resources/icons/battery-060-light.png rename to Resources/icons/battery-060-light.png diff --git a/src/Resources/icons/battery-080-dark.png b/Resources/icons/battery-080-dark.png similarity index 100% rename from src/Resources/icons/battery-080-dark.png rename to Resources/icons/battery-080-dark.png diff --git a/src/Resources/icons/battery-080-light.png b/Resources/icons/battery-080-light.png similarity index 100% rename from src/Resources/icons/battery-080-light.png rename to Resources/icons/battery-080-light.png diff --git a/src/Resources/icons/battery-100-charging-dark.png b/Resources/icons/battery-100-charging-dark.png similarity index 100% rename from src/Resources/icons/battery-100-charging-dark.png rename to Resources/icons/battery-100-charging-dark.png diff --git a/src/Resources/icons/battery-100-charging-light.png b/Resources/icons/battery-100-charging-light.png similarity index 100% rename from src/Resources/icons/battery-100-charging-light.png rename to Resources/icons/battery-100-charging-light.png diff --git a/src/Resources/icons/battery-100-dark.png b/Resources/icons/battery-100-dark.png similarity index 100% rename from src/Resources/icons/battery-100-dark.png rename to Resources/icons/battery-100-dark.png diff --git a/src/Resources/icons/battery-100-light.png b/Resources/icons/battery-100-light.png similarity index 100% rename from src/Resources/icons/battery-100-light.png rename to Resources/icons/battery-100-light.png diff --git a/src/Resources/icons/battery-missing-dark.png b/Resources/icons/battery-missing-dark.png similarity index 100% rename from src/Resources/icons/battery-missing-dark.png rename to Resources/icons/battery-missing-dark.png diff --git a/src/Resources/icons/battery-missing-light.png b/Resources/icons/battery-missing-light.png similarity index 100% rename from src/Resources/icons/battery-missing-light.png rename to Resources/icons/battery-missing-light.png diff --git a/src/Resources/icons/icon.ico b/Resources/icons/icon.ico similarity index 100% rename from src/Resources/icons/icon.ico rename to Resources/icons/icon.ico diff --git a/src/Resources/icons/icon.png b/Resources/icons/icon.png similarity index 100% rename from src/Resources/icons/icon.png rename to Resources/icons/icon.png diff --git a/src/Resources/resources.qrc b/Resources/resources.qrc similarity index 100% rename from src/Resources/resources.qrc rename to Resources/resources.qrc diff --git a/src/Resources/tr/HeadsetControl-Qt_de.ts b/Resources/tr/HeadsetControl-Qt_de.ts similarity index 100% rename from src/Resources/tr/HeadsetControl-Qt_de.ts rename to Resources/tr/HeadsetControl-Qt_de.ts diff --git a/src/Resources/tr/HeadsetControl-Qt_en.ts b/Resources/tr/HeadsetControl-Qt_en.ts similarity index 100% rename from src/Resources/tr/HeadsetControl-Qt_en.ts rename to Resources/tr/HeadsetControl-Qt_en.ts diff --git a/src/Resources/tr/HeadsetControl-Qt_es.ts b/Resources/tr/HeadsetControl-Qt_es.ts similarity index 100% rename from src/Resources/tr/HeadsetControl-Qt_es.ts rename to Resources/tr/HeadsetControl-Qt_es.ts diff --git a/src/Resources/tr/HeadsetControl-Qt_fr.ts b/Resources/tr/HeadsetControl-Qt_fr.ts similarity index 100% rename from src/Resources/tr/HeadsetControl-Qt_fr.ts rename to Resources/tr/HeadsetControl-Qt_fr.ts diff --git a/src/Resources/tr/HeadsetControl-Qt_hu.ts b/Resources/tr/HeadsetControl-Qt_hu.ts similarity index 100% rename from src/Resources/tr/HeadsetControl-Qt_hu.ts rename to Resources/tr/HeadsetControl-Qt_hu.ts diff --git a/src/Resources/tr/HeadsetControl-Qt_it.ts b/Resources/tr/HeadsetControl-Qt_it.ts similarity index 100% rename from src/Resources/tr/HeadsetControl-Qt_it.ts rename to Resources/tr/HeadsetControl-Qt_it.ts diff --git a/src/ShortcutManager/shortcutmanager.cpp b/ShortcutManager/ShortcutManager.cpp similarity index 100% rename from src/ShortcutManager/shortcutmanager.cpp rename to ShortcutManager/ShortcutManager.cpp diff --git a/src/ShortcutManager/shortcutmanager.h b/ShortcutManager/ShortcutManager.h similarity index 100% rename from src/ShortcutManager/shortcutmanager.h rename to ShortcutManager/ShortcutManager.h diff --git a/src/Utils/utils.cpp b/Utils/Utils.cpp similarity index 99% rename from src/Utils/utils.cpp rename to Utils/Utils.cpp index f896fe8..3413a7e 100644 --- a/src/Utils/utils.cpp +++ b/Utils/Utils.cpp @@ -1,4 +1,4 @@ -#include "utils.h" +#include "Utils.h" #include #include #include diff --git a/src/Utils/utils.h b/Utils/Utils.h similarity index 99% rename from src/Utils/utils.h rename to Utils/Utils.h index 8a83bdf..635b3b2 100644 --- a/src/Utils/utils.h +++ b/Utils/Utils.h @@ -1,5 +1,6 @@ #ifndef UTILS_H #define UTILS_H + #include #include #include diff --git a/src/Worker/worker.cpp b/Worker/Worker.cpp similarity index 98% rename from src/Worker/worker.cpp rename to Worker/Worker.cpp index 1173862..5ca7955 100644 --- a/src/Worker/worker.cpp +++ b/Worker/Worker.cpp @@ -1,4 +1,4 @@ -#include "worker.h" +#include "Worker.h" #include #include diff --git a/src/Worker/worker.h b/Worker/Worker.h similarity index 100% rename from src/Worker/worker.h rename to Worker/Worker.h diff --git a/src/main.cpp b/main.cpp similarity index 88% rename from src/main.cpp rename to main.cpp index cb503f6..af6bd0c 100644 --- a/src/main.cpp +++ b/main.cpp @@ -1,4 +1,4 @@ -#include "headsetcontrolqt.h" +#include "HeadsetControlQt.h" #include int main(int argc, char *argv[])