From 7a78ace6081423c95fe761bbc605b5904e1fdd02 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Wed, 19 Apr 2023 16:36:04 -0700 Subject: [PATCH] Qt/Config: Move BalloonTip.h/cpp from Graphics to ToolTipControls BalloonTip.h/cpp are only used from the ToolTipControls folder, so move them there. --- Source/Core/DolphinQt/CMakeLists.txt | 4 ++-- Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp | 1 - .../Config/{Graphics => ToolTipControls}/BalloonTip.cpp | 2 +- .../Config/{Graphics => ToolTipControls}/BalloonTip.h | 0 Source/Core/DolphinQt/Config/ToolTipControls/ToolTipWidget.h | 2 +- Source/Core/DolphinQt/DolphinQt.vcxproj | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) rename Source/Core/DolphinQt/Config/{Graphics => ToolTipControls}/BalloonTip.cpp (99%) rename Source/Core/DolphinQt/Config/{Graphics => ToolTipControls}/BalloonTip.h (100%) 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 ceb459c57a..99099496a2 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& setting, bool reverse) diff --git a/Source/Core/DolphinQt/Config/Graphics/BalloonTip.cpp b/Source/Core/DolphinQt/Config/ToolTipControls/BalloonTip.cpp similarity index 99% rename from Source/Core/DolphinQt/Config/Graphics/BalloonTip.cpp rename to 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 diff --git a/Source/Core/DolphinQt/Config/Graphics/BalloonTip.h b/Source/Core/DolphinQt/Config/ToolTipControls/BalloonTip.h similarity index 100% rename from Source/Core/DolphinQt/Config/Graphics/BalloonTip.h rename to 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 -#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 @@ - @@ -118,6 +117,7 @@ + @@ -268,7 +268,6 @@ - @@ -314,6 +313,7 @@ +