summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorMai <mai.iam2048@gmail.com>2023-04-20 10:45:03 -0400
committerGitHub <noreply@github.com>2023-04-20 10:45:03 -0400
commitc3cc1de54e89f7d0dced58b247a95dd052b7c26e (patch)
tree3db9c1ebc8d87802352d696be2f4ace402206fed /Source
parente0d6b4642d4f04fa733a7ad53b1ae919f83e19b3 (diff)
parent7a78ace6081423c95fe761bbc605b5904e1fdd02 (diff)
Merge pull request #11777 from Dentomologist/move_balloontip_files
Qt/Config: Move BalloonTip files from Graphics to ToolTipControls
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinQt/CMakeLists.txt4
-rw-r--r--Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp1
-rw-r--r--Source/Core/DolphinQt/Config/ToolTipControls/BalloonTip.cpp (renamed from Source/Core/DolphinQt/Config/Graphics/BalloonTip.cpp)2
-rw-r--r--Source/Core/DolphinQt/Config/ToolTipControls/BalloonTip.h (renamed from Source/Core/DolphinQt/Config/Graphics/BalloonTip.h)0
-rw-r--r--Source/Core/DolphinQt/Config/ToolTipControls/ToolTipWidget.h2
-rw-r--r--Source/Core/DolphinQt/DolphinQt.vcxproj4
6 files changed, 6 insertions, 7 deletions
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
index 36693b83bc..f4bbaf268d 100644
--- a/Source/Core/DolphinQt/CMakeLists.txt
+++ b/Source/Core/DolphinQt/CMakeLists.txt
@@ -69,8 +69,6 @@ add_executable(dolphin-emu
Config/GeckoCodeWidget.h
Config/Graphics/AdvancedWidget.cpp
Config/Graphics/AdvancedWidget.h
- Config/Graphics/BalloonTip.cpp
- Config/Graphics/BalloonTip.h
Config/Graphics/EnhancementsWidget.cpp
Config/Graphics/EnhancementsWidget.h
Config/Graphics/GeneralWidget.cpp
@@ -169,6 +167,8 @@ add_executable(dolphin-emu
Config/PropertiesDialog.h
Config/SettingsWindow.cpp
Config/SettingsWindow.h
+ Config/ToolTipControls/BalloonTip.cpp
+ Config/ToolTipControls/BalloonTip.h
Config/ToolTipControls/ToolTipCheckBox.cpp
Config/ToolTipControls/ToolTipCheckBox.h
Config/ToolTipControls/ToolTipComboBox.cpp
diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp
index 7892714ec9..33ca546f48 100644
--- a/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp
@@ -9,7 +9,6 @@
#include "Common/Config/Config.h"
-#include "DolphinQt/Config/Graphics/BalloonTip.h"
#include "DolphinQt/Settings.h"
GraphicsBool::GraphicsBool(const QString& label, const Config::Info<bool>& setting, bool reverse)
diff --git a/Source/Core/DolphinQt/Config/Graphics/BalloonTip.cpp b/Source/Core/DolphinQt/Config/ToolTipControls/BalloonTip.cpp
index 174745258e..7f5516bbd2 100644
--- a/Source/Core/DolphinQt/Config/Graphics/BalloonTip.cpp
+++ b/Source/Core/DolphinQt/Config/ToolTipControls/BalloonTip.cpp
@@ -1,7 +1,7 @@
// Copyright 2020 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "DolphinQt/Config/Graphics/BalloonTip.h"
+#include "DolphinQt/Config/ToolTipControls/BalloonTip.h"
#include <memory>
diff --git a/Source/Core/DolphinQt/Config/Graphics/BalloonTip.h b/Source/Core/DolphinQt/Config/ToolTipControls/BalloonTip.h
index a0a918325b..a0a918325b 100644
--- a/Source/Core/DolphinQt/Config/Graphics/BalloonTip.h
+++ b/Source/Core/DolphinQt/Config/ToolTipControls/BalloonTip.h
diff --git a/Source/Core/DolphinQt/Config/ToolTipControls/ToolTipWidget.h b/Source/Core/DolphinQt/Config/ToolTipControls/ToolTipWidget.h
index bd4b0fb6a2..6e3658e8bb 100644
--- a/Source/Core/DolphinQt/Config/ToolTipControls/ToolTipWidget.h
+++ b/Source/Core/DolphinQt/Config/ToolTipControls/ToolTipWidget.h
@@ -7,7 +7,7 @@
#include <QString>
-#include "DolphinQt/Config/Graphics/BalloonTip.h"
+#include "DolphinQt/Config/ToolTipControls/BalloonTip.h"
constexpr int TOOLTIP_DELAY = 300;
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
index 01280a46a9..596e661219 100644
--- a/Source/Core/DolphinQt/DolphinQt.vcxproj
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -68,7 +68,6 @@
<ClCompile Include="Config\GamecubeControllersWidget.cpp" />
<ClCompile Include="Config\GeckoCodeWidget.cpp" />
<ClCompile Include="Config\Graphics\AdvancedWidget.cpp" />
- <ClCompile Include="Config\Graphics\BalloonTip.cpp" />
<ClCompile Include="Config\Graphics\EnhancementsWidget.cpp" />
<ClCompile Include="Config\Graphics\GeneralWidget.cpp" />
<ClCompile Include="Config\Graphics\GraphicsBool.cpp" />
@@ -118,6 +117,7 @@
<ClCompile Include="Config\PatchesWidget.cpp" />
<ClCompile Include="Config\PropertiesDialog.cpp" />
<ClCompile Include="Config\SettingsWindow.cpp" />
+ <ClCompile Include="Config\ToolTipControls\BalloonTip.cpp" />
<ClCompile Include="Config\ToolTipControls\ToolTipCheckBox.cpp" />
<ClCompile Include="Config\ToolTipControls\ToolTipComboBox.cpp" />
<ClCompile Include="Config\ToolTipControls\ToolTipRadioButton.cpp" />
@@ -268,7 +268,6 @@
<QtMoc Include="Config\GameConfigWidget.h" />
<QtMoc Include="Config\GeckoCodeWidget.h" />
<QtMoc Include="Config\Graphics\AdvancedWidget.h" />
- <QtMoc Include="Config\Graphics\BalloonTip.h" />
<QtMoc Include="Config\Graphics\EnhancementsWidget.h" />
<QtMoc Include="Config\Graphics\GeneralWidget.h" />
<QtMoc Include="Config\Graphics\GraphicsBool.h" />
@@ -314,6 +313,7 @@
<QtMoc Include="Config\Mapping\WiimoteEmuMotionControlIMU.h" />
<QtMoc Include="Config\PropertiesDialog.h" />
<QtMoc Include="Config\SettingsWindow.h" />
+ <QtMoc Include="Config\ToolTipControls\BalloonTip.h" />
<ClInclude Include="Config\ToolTipControls\ToolTipCheckBox.h" />
<ClInclude Include="Config\ToolTipControls\ToolTipComboBox.h" />
<ClInclude Include="Config\ToolTipControls\ToolTipRadioButton.h" />