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"
 

Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/AdvancedWidget.h"
+#include "DolphinQt/Config/Graphics/AdvancedWidget.h"
 
 #include <QCheckBox>
 #include <QGridLayout>
@@ -14,10 +14,10 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsChoice.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "VideoCommon/VideoConfig.h"
 

Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;

Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/EnhancementsWidget.h"
+#include "DolphinQt/Config/Graphics/EnhancementsWidget.h"
 
 #include <cmath>
 
@@ -15,12 +15,12 @@
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
-#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsChoice.h"
+#include "DolphinQt/Config/Graphics/GraphicsSlider.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "UICommon/VideoUtils.h"
 

Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;

Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GeneralWidget.h"
+#include "DolphinQt/Config/Graphics/GeneralWidget.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -18,11 +18,11 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
-#include "DolphinQt2/Config/Graphics/GraphicsRadio.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsChoice.h"
+#include "DolphinQt/Config/Graphics/GraphicsRadio.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "UICommon/VideoUtils.h"
 

Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <array>
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;

Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
 
 #include "Common/Config/Config.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 #include <QFont>
 

Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
+#include "DolphinQt/Config/Graphics/GraphicsChoice.h"
 
 #include "Common/Config/Config.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 GraphicsChoice::GraphicsChoice(const QStringList& options, const Config::ConfigInfo<int>& setting)
     : m_setting(setting)

Source/Core/DolphinQt/Config/Graphics/GraphicsRadio.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsRadio.h"
+#include "DolphinQt/Config/Graphics/GraphicsRadio.h"
 
 #include "Common/Config/Config.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 GraphicsRadioInt::GraphicsRadioInt(const QString& label, const Config::ConfigInfo<int>& setting,
                                    int value)

Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
+#include "DolphinQt/Config/Graphics/GraphicsSlider.h"
 
 #include "Common/Config/Config.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 GraphicsSlider::GraphicsSlider(int minimum, int maximum, const Config::ConfigInfo<int>& setting,
                                int tick)

Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 #include <QEvent>
 #include <QLabel>
 
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
 
 GraphicsWidget::GraphicsWidget(GraphicsWindow* parent)
 {

Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
 
 #include <QDialogButtonBox>
 #include <QEvent>
@@ -13,13 +13,13 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/AdvancedWidget.h"
-#include "DolphinQt2/Config/Graphics/EnhancementsWidget.h"
-#include "DolphinQt2/Config/Graphics/GeneralWidget.h"
-#include "DolphinQt2/Config/Graphics/HacksWidget.h"
-#include "DolphinQt2/Config/Graphics/SoftwareRendererWidget.h"
-#include "DolphinQt2/MainWindow.h"
-#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
+#include "DolphinQt/Config/Graphics/AdvancedWidget.h"
+#include "DolphinQt/Config/Graphics/EnhancementsWidget.h"
+#include "DolphinQt/Config/Graphics/GeneralWidget.h"
+#include "DolphinQt/Config/Graphics/HacksWidget.h"
+#include "DolphinQt/Config/Graphics/SoftwareRendererWidget.h"
+#include "DolphinQt/MainWindow.h"
+#include "DolphinQt/QtUtils/WrapInScrollArea.h"
 
 #include "VideoCommon/VideoBackendBase.h"
 #include "VideoCommon/VideoConfig.h"

Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/HacksWidget.h"
+#include "DolphinQt/Config/Graphics/HacksWidget.h"
 
 #include <QGridLayout>
 #include <QGroupBox>
@@ -12,10 +12,10 @@
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsSlider.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "VideoCommon/VideoConfig.h"
 

Source/Core/DolphinQt/Config/Graphics/HacksWidget.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;

Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h"
+#include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
 
 #include <cmath>
 #include <vector>
@@ -19,7 +19,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "DolphinQt2/Config/Graphics/EnhancementsWidget.h"
+#include "DolphinQt/Config/Graphics/EnhancementsWidget.h"
 
 #include "VideoCommon/PostProcessing.h"
 #include "VideoCommon/RenderBase.h"

Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/SoftwareRendererWidget.h"
+#include "DolphinQt/Config/Graphics/SoftwareRendererWidget.h"
 
 #include <QComboBox>
 #include <QGridLayout>
@@ -14,9 +14,9 @@
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "UICommon/VideoUtils.h"
 

Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;

Source/Core/DolphinQt/Config/InfoWidget.cpp

@@ -19,8 +19,8 @@
 #include "DiscIO/Blob.h"
 #include "DiscIO/Enums.h"
 
-#include "DolphinQt2/Config/InfoWidget.h"
-#include "DolphinQt2/QtUtils/ImageConverter.h"
+#include "DolphinQt/Config/InfoWidget.h"
+#include "DolphinQt/QtUtils/ImageConverter.h"
 
 #include "UICommon/UICommon.h"
 

Source/Core/DolphinQt/Config/LogConfigWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/LogConfigWidget.h"
+#include "DolphinQt/Config/LogConfigWidget.h"
 
 #include <QCheckBox>
 #include <QGroupBox>
@@ -16,7 +16,7 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 LogConfigWidget::LogConfigWidget(QWidget* parent) : QDockWidget(parent)
 {

Source/Core/DolphinQt/Config/LogWidget.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/LogWidget.h"
+#include "DolphinQt/Config/LogWidget.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -19,7 +19,7 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 // Delay in ms between calls of UpdateLog()
 constexpr int UPDATE_LOG_DELAY = 100;

Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.cpp

@@ -7,7 +7,7 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-#include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
+#include "DolphinQt/Config/Mapping/GCKeyboardEmu.h"
 
 #include "InputCommon/InputConfig.h"
 

Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QCheckBox;
 class QFormLayout;

Source/Core/DolphinQt/Config/Mapping/GCMicrophone.cpp

@@ -7,7 +7,7 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-#include "DolphinQt2/Config/Mapping/GCMicrophone.h"
+#include "DolphinQt/Config/Mapping/GCMicrophone.h"
 
 #include "InputCommon/InputConfig.h"
 

Source/Core/DolphinQt/Config/Mapping/GCMicrophone.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QCheckBox;
 class QFormLayout;

Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/GCPadEmu.h"
+#include "DolphinQt/Config/Mapping/GCPadEmu.h"
 
 #include <QFormLayout>
 #include <QGroupBox>

Source/Core/DolphinQt/Config/Mapping/GCPadEmu.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QCheckBox;
 class QFormLayout;

Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp

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

Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/Hotkey3D.h"
+#include "DolphinQt/Config/Mapping/Hotkey3D.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>

Source/Core/DolphinQt/Config/Mapping/Hotkey3D.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 

Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyDebugging.h"
+#include "DolphinQt/Config/Mapping/HotkeyDebugging.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>

Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 

Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyGeneral.h"
+#include "DolphinQt/Config/Mapping/HotkeyGeneral.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>

Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 

Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyGraphics.h"
+#include "DolphinQt/Config/Mapping/HotkeyGraphics.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>

Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 

Source/Core/DolphinQt/Config/Mapping/HotkeyStates.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyStates.h"
+#include "DolphinQt/Config/Mapping/HotkeyStates.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>

Source/Core/DolphinQt/Config/Mapping/HotkeyStates.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 

Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyStatesOther.h"
+#include "DolphinQt/Config/Mapping/HotkeyStatesOther.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>

Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 

Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyTAS.h"
+#include "DolphinQt/Config/Mapping/HotkeyTAS.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>

Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 

Source/Core/DolphinQt/Config/Mapping/HotkeyWii.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyWii.h"
+#include "DolphinQt/Config/Mapping/HotkeyWii.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>

Source/Core/DolphinQt/Config/Mapping/HotkeyWii.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 

Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/IOWindow.h"
+#include "DolphinQt/Config/Mapping/IOWindow.h"
 
 #include <thread>
 
@@ -20,9 +20,9 @@
 
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Mapping/MappingCommon.h"
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
-#include "DolphinQt2/QtUtils/BlockUserInputFilter.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/QtUtils/BlockUserInputFilter.h"
 
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"

Source/Core/DolphinQt/Config/Mapping/MappingBool.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingBool.h"
+#include "DolphinQt/Config/Mapping/MappingBool.h"
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"

Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp

@@ -13,17 +13,17 @@
 #include <QString>
 #include <QTimer>
 
-#include "DolphinQt2/Config/Mapping/MappingButton.h"
+#include "DolphinQt/Config/Mapping/MappingButton.h"
 
 #include "Common/Thread.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Mapping/IOWindow.h"
-#include "DolphinQt2/Config/Mapping/MappingCommon.h"
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
-#include "DolphinQt2/QtUtils/BlockUserInputFilter.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Mapping/IOWindow.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/QtUtils/BlockUserInputFilter.h"
+#include "DolphinQt/Settings.h"
 
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"

Source/Core/DolphinQt/Config/Mapping/MappingButton.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "Common/Flag.h"
-#include "DolphinQt2/QtUtils/ElidedButton.h"
+#include "DolphinQt/QtUtils/ElidedButton.h"
 
 class ControlReference;
 class MappingWidget;

Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingCommon.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
 
 #include <QRegExp>
 #include <QString>

Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingIndicator.h"
+#include "DolphinQt/Config/Mapping/MappingIndicator.h"
 
 #include <array>
 #include <cmath>
@@ -16,7 +16,7 @@
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 MappingIndicator::MappingIndicator(ControllerEmu::ControlGroup* group) : m_group(group)
 {

Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingNumeric.h"
+#include "DolphinQt/Config/Mapping/MappingNumeric.h"
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"

Source/Core/DolphinQt/Config/Mapping/MappingRadio.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingRadio.h"
+#include "DolphinQt/Config/Mapping/MappingRadio.h"
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"

Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp

@@ -2,19 +2,19 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 #include <QFormLayout>
 #include <QGroupBox>
 #include <QPushButton>
 
-#include "DolphinQt2/Config/Mapping/IOWindow.h"
-#include "DolphinQt2/Config/Mapping/MappingBool.h"
-#include "DolphinQt2/Config/Mapping/MappingButton.h"
-#include "DolphinQt2/Config/Mapping/MappingIndicator.h"
-#include "DolphinQt2/Config/Mapping/MappingNumeric.h"
-#include "DolphinQt2/Config/Mapping/MappingRadio.h"
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/Config/Mapping/IOWindow.h"
+#include "DolphinQt/Config/Mapping/MappingBool.h"
+#include "DolphinQt/Config/Mapping/MappingButton.h"
+#include "DolphinQt/Config/Mapping/MappingIndicator.h"
+#include "DolphinQt/Config/Mapping/MappingNumeric.h"
+#include "DolphinQt/Config/Mapping/MappingRadio.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
 
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"

Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -21,22 +21,22 @@
 
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
-#include "DolphinQt2/Config/Mapping/GCMicrophone.h"
-#include "DolphinQt2/Config/Mapping/GCPadEmu.h"
-#include "DolphinQt2/Config/Mapping/Hotkey3D.h"
-#include "DolphinQt2/Config/Mapping/HotkeyDebugging.h"
-#include "DolphinQt2/Config/Mapping/HotkeyGeneral.h"
-#include "DolphinQt2/Config/Mapping/HotkeyGraphics.h"
-#include "DolphinQt2/Config/Mapping/HotkeyStates.h"
-#include "DolphinQt2/Config/Mapping/HotkeyStatesOther.h"
-#include "DolphinQt2/Config/Mapping/HotkeyTAS.h"
-#include "DolphinQt2/Config/Mapping/HotkeyWii.h"
-#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h"
-#include "DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h"
-#include "DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h"
-#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Mapping/GCKeyboardEmu.h"
+#include "DolphinQt/Config/Mapping/GCMicrophone.h"
+#include "DolphinQt/Config/Mapping/GCPadEmu.h"
+#include "DolphinQt/Config/Mapping/Hotkey3D.h"
+#include "DolphinQt/Config/Mapping/HotkeyDebugging.h"
+#include "DolphinQt/Config/Mapping/HotkeyGeneral.h"
+#include "DolphinQt/Config/Mapping/HotkeyGraphics.h"
+#include "DolphinQt/Config/Mapping/HotkeyStates.h"
+#include "DolphinQt/Config/Mapping/HotkeyStatesOther.h"
+#include "DolphinQt/Config/Mapping/HotkeyTAS.h"
+#include "DolphinQt/Config/Mapping/HotkeyWii.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuGeneral.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h"
+#include "DolphinQt/QtUtils/WrapInScrollArea.h"
+#include "DolphinQt/Settings.h"
 
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"

Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>

Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QGroupBox;
 class QHBoxLayout;

Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuGeneral.h"
 
 #include <QComboBox>
 #include <QFormLayout>
@@ -13,7 +13,7 @@
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
-#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
 
 #include "InputCommon/ControllerEmu/ControlGroup/Extension.h"
 #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"

Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QComboBox;
 class QHBoxLayout;

Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h"
 
 #include <QFormLayout>
 #include <QGroupBox>

Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QCheckBox;
 class QFormLayout;

Source/Core/DolphinQt/Config/NewPatchDialog.cpp

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