Move DolphinQt2 to DolphinQt

Ben754 · Jul 6, 2018 · 13ba24c · 13ba24c
1 parent 059880b
commit 13ba24c
Show file tree

Hide file tree

Showing 233 changed files with 392 additions and 392 deletions.
diff --git a/CMakeLists.txt b/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()

diff --git a/Source/Core/CMakeLists.txt b/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()
diff --git a/Source/Core/DolphinQt2/AboutDialog.cpp → Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt2/AboutDialog.cpp → 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)
 {

diff --git a/Source/Core/DolphinQt2/AboutDialog.h → Source/Core/DolphinQt/AboutDialog.h b/Source/Core/DolphinQt2/AboutDialog.h → Source/Core/DolphinQt/AboutDialog.h
diff --git a/Source/Core/DolphinQt2/CMakeLists.txt → Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt2/CMakeLists.txt → 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

diff --git a/Source/Core/DolphinQt2/CheatsManager.cpp → Source/Core/DolphinQt/CheatsManager.cpp b/Source/Core/DolphinQt2/CheatsManager.cpp → 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;
 

diff --git a/Source/Core/DolphinQt2/CheatsManager.h → Source/Core/DolphinQt/CheatsManager.h b/Source/Core/DolphinQt2/CheatsManager.h → Source/Core/DolphinQt/CheatsManager.h
diff --git a/...e/Core/DolphinQt2/Config/ARCodeWidget.cpp → ...ce/Core/DolphinQt/Config/ARCodeWidget.cpp b/...e/Core/DolphinQt2/Config/ARCodeWidget.cpp → ...ce/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"
 

diff --git a/Source/Core/DolphinQt2/Config/ARCodeWidget.h → Source/Core/DolphinQt/Config/ARCodeWidget.h b/Source/Core/DolphinQt2/Config/ARCodeWidget.h → Source/Core/DolphinQt/Config/ARCodeWidget.h
diff --git a/...ore/DolphinQt2/Config/CheatCodeEditor.cpp → ...Core/DolphinQt/Config/CheatCodeEditor.cpp b/...ore/DolphinQt2/Config/CheatCodeEditor.cpp → ...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>

diff --git a/.../Core/DolphinQt2/Config/CheatCodeEditor.h → ...e/Core/DolphinQt/Config/CheatCodeEditor.h b/.../Core/DolphinQt2/Config/CheatCodeEditor.h → ...e/Core/DolphinQt/Config/CheatCodeEditor.h
diff --git a/.../DolphinQt2/Config/CheatWarningWidget.cpp → ...e/DolphinQt/Config/CheatWarningWidget.cpp b/.../DolphinQt2/Config/CheatWarningWidget.cpp → ...e/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)

diff --git a/...re/DolphinQt2/Config/CheatWarningWidget.h → ...ore/DolphinQt/Config/CheatWarningWidget.h b/...re/DolphinQt2/Config/CheatWarningWidget.h → ...ore/DolphinQt/Config/CheatWarningWidget.h
diff --git a/...e/DolphinQt2/Config/ControllersWindow.cpp → ...re/DolphinQt/Config/ControllersWindow.cpp b/...e/DolphinQt2/Config/ControllersWindow.cpp → ...re/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"
 

diff --git a/...ore/DolphinQt2/Config/ControllersWindow.h → ...Core/DolphinQt/Config/ControllersWindow.h b/...ore/DolphinQt2/Config/ControllersWindow.h → ...Core/DolphinQt/Config/ControllersWindow.h
diff --git a/...re/DolphinQt2/Config/FilesystemWidget.cpp → ...ore/DolphinQt/Config/FilesystemWidget.cpp b/...re/DolphinQt2/Config/FilesystemWidget.cpp → ...ore/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"
 

diff --git a/...Core/DolphinQt2/Config/FilesystemWidget.h → .../Core/DolphinQt/Config/FilesystemWidget.h b/...Core/DolphinQt2/Config/FilesystemWidget.h → .../Core/DolphinQt/Config/FilesystemWidget.h
diff --git a/...re/DolphinQt2/Config/GameConfigWidget.cpp → ...ore/DolphinQt/Config/GameConfigWidget.cpp b/...re/DolphinQt2/Config/GameConfigWidget.cpp → ...ore/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"
 

diff --git a/...Core/DolphinQt2/Config/GameConfigWidget.h → .../Core/DolphinQt/Config/GameConfigWidget.h b/...Core/DolphinQt2/Config/GameConfigWidget.h → .../Core/DolphinQt/Config/GameConfigWidget.h
diff --git a/...ore/DolphinQt2/Config/GeckoCodeWidget.cpp → ...Core/DolphinQt/Config/GeckoCodeWidget.cpp b/...ore/DolphinQt2/Config/GeckoCodeWidget.cpp → ...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"
 

diff --git a/.../Core/DolphinQt2/Config/GeckoCodeWidget.h → ...e/Core/DolphinQt/Config/GeckoCodeWidget.h b/.../Core/DolphinQt2/Config/GeckoCodeWidget.h → ...e/Core/DolphinQt/Config/GeckoCodeWidget.h
diff --git a/...hinQt2/Config/Graphics/AdvancedWidget.cpp → ...phinQt/Config/Graphics/AdvancedWidget.cpp b/...hinQt2/Config/Graphics/AdvancedWidget.cpp → ...phinQt/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"
 

diff --git a/...lphinQt2/Config/Graphics/AdvancedWidget.h → ...olphinQt/Config/Graphics/AdvancedWidget.h b/...lphinQt2/Config/Graphics/AdvancedWidget.h → ...olphinQt/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;

diff --git a/...t2/Config/Graphics/EnhancementsWidget.cpp → ...Qt/Config/Graphics/EnhancementsWidget.cpp b/...t2/Config/Graphics/EnhancementsWidget.cpp → ...Qt/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"
 

diff --git a/...nQt2/Config/Graphics/EnhancementsWidget.h → ...inQt/Config/Graphics/EnhancementsWidget.h b/...nQt2/Config/Graphics/EnhancementsWidget.h → ...inQt/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;

diff --git a/...phinQt2/Config/Graphics/GeneralWidget.cpp → ...lphinQt/Config/Graphics/GeneralWidget.cpp b/...phinQt2/Config/Graphics/GeneralWidget.cpp → ...lphinQt/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"
 

diff --git a/...olphinQt2/Config/Graphics/GeneralWidget.h → ...DolphinQt/Config/Graphics/GeneralWidget.h b/...olphinQt2/Config/Graphics/GeneralWidget.h → ...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;

diff --git a/...lphinQt2/Config/Graphics/GraphicsBool.cpp → ...olphinQt/Config/Graphics/GraphicsBool.cpp b/...lphinQt2/Config/Graphics/GraphicsBool.cpp → ...olphinQt/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>
 

diff --git a/...DolphinQt2/Config/Graphics/GraphicsBool.h → .../DolphinQt/Config/Graphics/GraphicsBool.h b/...DolphinQt2/Config/Graphics/GraphicsBool.h → .../DolphinQt/Config/Graphics/GraphicsBool.h
diff --git a/...hinQt2/Config/Graphics/GraphicsChoice.cpp → ...phinQt/Config/Graphics/GraphicsChoice.cpp b/...hinQt2/Config/Graphics/GraphicsChoice.cpp → ...phinQt/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)

diff --git a/...lphinQt2/Config/Graphics/GraphicsChoice.h → ...olphinQt/Config/Graphics/GraphicsChoice.h b/...lphinQt2/Config/Graphics/GraphicsChoice.h → ...olphinQt/Config/Graphics/GraphicsChoice.h
diff --git a/...phinQt2/Config/Graphics/GraphicsRadio.cpp → ...lphinQt/Config/Graphics/GraphicsRadio.cpp b/...phinQt2/Config/Graphics/GraphicsRadio.cpp → ...lphinQt/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)

diff --git a/...olphinQt2/Config/Graphics/GraphicsRadio.h → ...DolphinQt/Config/Graphics/GraphicsRadio.h b/...olphinQt2/Config/Graphics/GraphicsRadio.h → ...DolphinQt/Config/Graphics/GraphicsRadio.h
diff --git a/...hinQt2/Config/Graphics/GraphicsSlider.cpp → ...phinQt/Config/Graphics/GraphicsSlider.cpp b/...hinQt2/Config/Graphics/GraphicsSlider.cpp → ...phinQt/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)

diff --git a/...lphinQt2/Config/Graphics/GraphicsSlider.h → ...olphinQt/Config/Graphics/GraphicsSlider.h b/...lphinQt2/Config/Graphics/GraphicsSlider.h → ...olphinQt/Config/Graphics/GraphicsSlider.h
diff --git a/...hinQt2/Config/Graphics/GraphicsWidget.cpp → ...phinQt/Config/Graphics/GraphicsWidget.cpp b/...hinQt2/Config/Graphics/GraphicsWidget.cpp → ...phinQt/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)
 {

diff --git a/...lphinQt2/Config/Graphics/GraphicsWidget.h → ...olphinQt/Config/Graphics/GraphicsWidget.h b/...lphinQt2/Config/Graphics/GraphicsWidget.h → ...olphinQt/Config/Graphics/GraphicsWidget.h