Merge pull request #7205 from spycrab/qt_rename

Move DolphinQt2 to DolphinQt

CMakeLists.txt

@@ -20,7 +20,7 @@ option(USE_EGL "Enables EGL OpenGL Interface" OFF)
 option(TRY_X11 "Enables X11 Support" ON)
 option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
 option(USE_UPNP "Enables UPnP port mapping support" ON)
-option(ENABLE_QT2 "Enable Qt (Default)" ON)
+option(ENABLE_QT "Enable Qt (Default)" ON)
 option(ENABLE_LTO "Enables Link Time Optimization" OFF)
 option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
 option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
@@ -373,7 +373,7 @@ if(ANDROID)
   set(USE_X11 0)
   set(USE_UPNP 0)
   set(USE_EGL 1)
-  set(ENABLE_QT2 0)
+  set(ENABLE_QT 0)
   set(USE_DISCORD_PRESENCE 0)
 
   # We are cross compiling, search only the toolchain for libraries and includes
@@ -395,7 +395,7 @@ if(ENABLE_HEADLESS)
     set(USE_EGL 1)
   endif()
   set(USE_X11 0)
-  set(ENABLE_QT2 0)
+  set(ENABLE_QT 0)
   set(USE_DISCORD_PRESENCE 0)
   add_definitions(-DUSE_HEADLESS)
 endif()

Source/Core/CMakeLists.txt

@@ -8,6 +8,6 @@ add_subdirectory(UICommon)
 add_subdirectory(VideoCommon)
 add_subdirectory(VideoBackends)
 
-if(ENABLE_QT2)
-  add_subdirectory(DolphinQt2)
+if(ENABLE_QT)
+  add_subdirectory(DolphinQt)
 endif()

Source/Core/DolphinQt/AboutDialog.cpp

@@ -8,8 +8,8 @@
 
 #include "Common/Version.h"
 
-#include "DolphinQt2/AboutDialog.h"
-#include "DolphinQt2/Resources.h"
+#include "DolphinQt/AboutDialog.h"
+#include "DolphinQt/Resources.h"
 
 AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
 {

Source/Core/DolphinQt/CMakeLists.txt

@@ -140,7 +140,7 @@ PRIVATE
 )
 
 if(WIN32)
-  target_sources(dolphin-emu PRIVATE DolphinQt2.manifest)
+  target_sources(dolphin-emu PRIVATE DolphinQt.manifest)
 endif()
 
 # Handle localization

Source/Core/DolphinQt/CheatsManager.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/CheatsManager.h"
+#include "DolphinQt/CheatsManager.h"
 
 #include <algorithm>
 #include <cstring>
@@ -30,11 +30,11 @@
 
 #include "UICommon/GameFile.h"
 
-#include "DolphinQt2/Config/ARCodeWidget.h"
-#include "DolphinQt2/Config/GeckoCodeWidget.h"
-#include "DolphinQt2/GameList/GameListModel.h"
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/ARCodeWidget.h"
+#include "DolphinQt/Config/GeckoCodeWidget.h"
+#include "DolphinQt/GameList/GameListModel.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Settings.h"
 
 constexpr u32 MAX_RESULTS = 50;
 

Source/Core/DolphinQt/Config/ARCodeWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/ARCodeWidget.h"
+#include "DolphinQt/Config/ARCodeWidget.h"
 
 #include <QButtonGroup>
 #include <QHBoxLayout>
@@ -16,8 +16,8 @@
 #include "Core/ActionReplay.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/CheatCodeEditor.h"
-#include "DolphinQt2/Config/CheatWarningWidget.h"
+#include "DolphinQt/Config/CheatCodeEditor.h"
+#include "DolphinQt/Config/CheatWarningWidget.h"
 
 #include "UICommon/GameFile.h"
 

Source/Core/DolphinQt/Config/CheatCodeEditor.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/CheatCodeEditor.h"
+#include "DolphinQt/Config/CheatCodeEditor.h"
 
 #include <QDialogButtonBox>
 #include <QFontDatabase>

Source/Core/DolphinQt/Config/CheatWarningWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/CheatWarningWidget.h"
+#include "DolphinQt/Config/CheatWarningWidget.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -13,7 +13,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 CheatWarningWidget::CheatWarningWidget(const std::string& game_id, bool restart_required,
                                        QWidget* parent)

Source/Core/DolphinQt/Config/ControllersWindow.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/ControllersWindow.h"
+#include "DolphinQt/Config/ControllersWindow.h"
 
 #include <QApplication>
 #include <QBoxLayout>
@@ -32,10 +32,10 @@
 #include "Core/IOS/USB/Bluetooth/BTReal.h"
 #include "Core/NetPlayProto.h"
 
-#include "DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h"
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
-#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/QtUtils/WrapInScrollArea.h"
+#include "DolphinQt/Settings.h"
 
 #include "InputCommon/GCAdapter.h"
 

Source/Core/DolphinQt/Config/FilesystemWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/FilesystemWidget.h"
+#include "DolphinQt/Config/FilesystemWidget.h"
 
 #include <QApplication>
 #include <QCoreApplication>
@@ -23,8 +23,8 @@
 #include "DiscIO/Filesystem.h"
 #include "DiscIO/Volume.h"
 
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Resources.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Resources.h"
 
 #include "UICommon/UICommon.h"
 

Source/Core/DolphinQt/Config/GameConfigWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/GameConfigWidget.h"
+#include "DolphinQt/Config/GameConfigWidget.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -24,7 +24,7 @@
 #include "Core/ConfigLoaders/GameConfigLoader.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
+#include "DolphinQt/Config/Graphics/GraphicsSlider.h"
 
 #include "UICommon/GameFile.h"
 

Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/GeckoCodeWidget.h"
+#include "DolphinQt/Config/GeckoCodeWidget.h"
 
 #include <QFontDatabase>
 #include <QFormLayout>
@@ -20,8 +20,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/GeckoCodeConfig.h"
 
-#include "DolphinQt2/Config/CheatCodeEditor.h"
-#include "DolphinQt2/Config/CheatWarningWidget.h"
+#include "DolphinQt/Config/CheatCodeEditor.h"
+#include "DolphinQt/Config/CheatWarningWidget.h"
 
 #include "UICommon/GameFile.h"