ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move DolphinQt2 to DolphinQt

This commit is contained in:
spycrab 2018-07-07 00:40:15 +02:00
parent 059880bb16
commit 13ba24c5a6
233 changed files with 392 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -20,7 +20,7 @@ option(USE_EGL "Enables EGL OpenGL Interface" OFF)
option(TRY_X11 "Enables X11 Support" ON) 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_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(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_LTO "Enables Link Time Optimization" OFF)
option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" 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) option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
@ -373,7 +373,7 @@ if(ANDROID)
set(USE_X11 0) set(USE_X11 0)
set(USE_UPNP 0) set(USE_UPNP 0)
set(USE_EGL 1) set(USE_EGL 1)
set(ENABLE_QT2 0) set(ENABLE_QT 0)
set(USE_DISCORD_PRESENCE 0) set(USE_DISCORD_PRESENCE 0)
# We are cross compiling, search only the toolchain for libraries and includes # We are cross compiling, search only the toolchain for libraries and includes
@ -395,7 +395,7 @@ if(ENABLE_HEADLESS)
set(USE_EGL 1) set(USE_EGL 1)
endif() endif()
set(USE_X11 0) set(USE_X11 0)
set(ENABLE_QT2 0) set(ENABLE_QT 0)
set(USE_DISCORD_PRESENCE 0) set(USE_DISCORD_PRESENCE 0)
add_definitions(-DUSE_HEADLESS) add_definitions(-DUSE_HEADLESS)
endif() endif()

4
Source/Core/CMakeLists.txt
View File

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

4
Source/Core/DolphinQt2/AboutDialog.cpp → Source/Core/DolphinQt/AboutDialog.cpp
View File

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

0
Source/Core/DolphinQt2/AboutDialog.h → Source/Core/DolphinQt/AboutDialog.h
View File

2
Source/Core/DolphinQt2/CMakeLists.txt → Source/Core/DolphinQt/CMakeLists.txt
View File

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

12
Source/Core/DolphinQt2/CheatsManager.cpp → Source/Core/DolphinQt/CheatsManager.cpp
View File

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

0
Source/Core/DolphinQt2/CheatsManager.h → Source/Core/DolphinQt/CheatsManager.h
View File

6
Source/Core/DolphinQt2/Config/ARCodeWidget.cpp → Source/Core/DolphinQt/Config/ARCodeWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/ARCodeWidget.h → Source/Core/DolphinQt/Config/ARCodeWidget.h
View File

2
Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp → Source/Core/DolphinQt/Config/CheatCodeEditor.cpp
View File

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

0
Source/Core/DolphinQt2/Config/CheatCodeEditor.h → Source/Core/DolphinQt/Config/CheatCodeEditor.h
View File

4
Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp → Source/Core/DolphinQt/Config/CheatWarningWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/CheatWarningWidget.h → Source/Core/DolphinQt/Config/CheatWarningWidget.h
View File

10
Source/Core/DolphinQt2/Config/ControllersWindow.cpp → Source/Core/DolphinQt/Config/ControllersWindow.cpp
View File

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

0
Source/Core/DolphinQt2/Config/ControllersWindow.h → Source/Core/DolphinQt/Config/ControllersWindow.h
View File

6
Source/Core/DolphinQt2/Config/FilesystemWidget.cpp → Source/Core/DolphinQt/Config/FilesystemWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/FilesystemWidget.h → Source/Core/DolphinQt/Config/FilesystemWidget.h
View File

4
Source/Core/DolphinQt2/Config/GameConfigWidget.cpp → Source/Core/DolphinQt/Config/GameConfigWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/GameConfigWidget.h → Source/Core/DolphinQt/Config/GameConfigWidget.h
View File

6
Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp → Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/GeckoCodeWidget.h → Source/Core/DolphinQt/Config/GeckoCodeWidget.h
View File

10
Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.cpp → Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.h → Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h
View File

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

14
Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp → Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.h → Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h
View File

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

12
Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp → Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.h → Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h
View File

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

4
Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp → Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.h → Source/Core/DolphinQt/Config/Graphics/GraphicsBool.h
View File

4
Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp → Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.h → Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.h
View File

4
Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp → Source/Core/DolphinQt/Config/Graphics/GraphicsRadio.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.h → Source/Core/DolphinQt/Config/Graphics/GraphicsRadio.h
View File

4
Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp → Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.h → Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.h
View File

4
Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp → Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.h → Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.h
View File

16
Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.cpp → Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.h → Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h
View File

10
Source/Core/DolphinQt2/Config/Graphics/HacksWidget.cpp → Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Graphics/HacksWidget.h → Source/Core/DolphinQt/Config/Graphics/HacksWidget.h
View File

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

4
Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp → Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h → Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.h
View File

8
Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.cpp → Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.h → Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h
View File

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

4
Source/Core/DolphinQt2/Config/InfoWidget.cpp → Source/Core/DolphinQt/Config/InfoWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/InfoWidget.h → Source/Core/DolphinQt/Config/InfoWidget.h
View File

4
Source/Core/DolphinQt2/Config/LogConfigWidget.cpp → Source/Core/DolphinQt/Config/LogConfigWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/LogConfigWidget.h → Source/Core/DolphinQt/Config/LogConfigWidget.h
View File

4
Source/Core/DolphinQt2/Config/LogWidget.cpp → Source/Core/DolphinQt/Config/LogWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/LogWidget.h → Source/Core/DolphinQt/Config/LogWidget.h
View File

2
Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp → Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h → Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.cpp → Source/Core/DolphinQt/Config/Mapping/GCMicrophone.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.h → Source/Core/DolphinQt/Config/Mapping/GCMicrophone.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp → Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h → Source/Core/DolphinQt/Config/Mapping/GCPadEmu.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp → Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h → Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h
View File

2
Source/Core/DolphinQt2/Config/Mapping/Hotkey3D.cpp → Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/Hotkey3D.h → Source/Core/DolphinQt/Config/Mapping/Hotkey3D.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyDebugging.cpp → Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyDebugging.h → Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyGeneral.cpp → Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyGeneral.h → Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyGraphics.cpp → Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyGraphics.h → Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyStates.cpp → Source/Core/DolphinQt/Config/Mapping/HotkeyStates.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyStates.h → Source/Core/DolphinQt/Config/Mapping/HotkeyStates.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyStatesOther.cpp → Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyStatesOther.h → Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyTAS.cpp → Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyTAS.h → Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyWii.cpp → Source/Core/DolphinQt/Config/Mapping/HotkeyWii.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/HotkeyWii.h → Source/Core/DolphinQt/Config/Mapping/HotkeyWii.h
View File

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

8
Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp → Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Mapping/IOWindow.h → Source/Core/DolphinQt/Config/Mapping/IOWindow.h
View File

4
Source/Core/DolphinQt2/Config/Mapping/MappingBool.cpp → Source/Core/DolphinQt/Config/Mapping/MappingBool.cpp
View File

@ -2,9 +2,9 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // 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/ControllerEmu.h"
#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h" #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"

0
Source/Core/DolphinQt2/Config/Mapping/MappingBool.h → Source/Core/DolphinQt/Config/Mapping/MappingBool.h
View File

14
Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp → Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/MappingButton.h → Source/Core/DolphinQt/Config/Mapping/MappingButton.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp → Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Mapping/MappingCommon.h → Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
View File

4
Source/Core/DolphinQt2/Config/Mapping/MappingIndicator.cpp → Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Mapping/MappingIndicator.h → Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h
View File

4
Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.cpp → Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
View File

@ -2,9 +2,9 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // 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/ControllerEmu.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"

0
Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.h → Source/Core/DolphinQt/Config/Mapping/MappingNumeric.h
View File

4
Source/Core/DolphinQt2/Config/Mapping/MappingRadio.cpp → Source/Core/DolphinQt/Config/Mapping/MappingRadio.cpp
View File

@ -2,9 +2,9 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // 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/ControllerEmu.h"
#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h" #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"

0
Source/Core/DolphinQt2/Config/Mapping/MappingRadio.h → Source/Core/DolphinQt/Config/Mapping/MappingRadio.h
View File

16
Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp → Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h → Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
View File

34
Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp → Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
View File

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

0
Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h → Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
View File

2
Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.cpp → Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.h → Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.h
View File

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

4
Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp → Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h → Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.h
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.cpp → Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.cpp
View File

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

2
Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h → Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h
View File

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

2
Source/Core/DolphinQt2/Config/NewPatchDialog.cpp → Source/Core/DolphinQt/Config/NewPatchDialog.cpp
View File

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

Some files were not shown because too many files have changed in this diff Show More