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

Merge pull request #7236 from lioncash/fwd 

DolphinQt/Settings: Replace includes with forward declarations
This commit is contained in:
spycrab 2018-07-10 16:24:33 +02:00 committed by GitHub
parent 4e54cce8d9 b4d91cc612
commit b9960777a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp
View File

@ -13,6 +13,9 @@
#include <QProgressBar> #include <QProgressBar>
#include <QVBoxLayout> #include <QVBoxLayout>
#include "Core/NetPlayClient.h"
#include "Core/NetPlayServer.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"
static QString GetPlayerNameFromPID(int pid) static QString GetPlayerNameFromPID(int pid)

8
Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
View File

@ -3,15 +3,17 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "DolphinQt/NetPlay/PadMappingDialog.h" #include "DolphinQt/NetPlay/PadMappingDialog.h"
#include "DolphinQt/Settings.h"
#include "Core/NetPlayClient.h"
#include <QComboBox> #include <QComboBox>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QGridLayout> #include <QGridLayout>
#include <QLabel> #include <QLabel>
#include "Core/NetPlayClient.h"
#include "Core/NetPlayServer.h"
#include "DolphinQt/Settings.h"
PadMappingDialog::PadMappingDialog(QWidget* parent) : QDialog(parent) PadMappingDialog::PadMappingDialog(QWidget* parent) : QDialog(parent)
{ {
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);

4
Source/Core/DolphinQt/Settings.cpp
View File

@ -19,6 +19,8 @@
#include "Core/Config/MainSettings.h" #include "Core/Config/MainSettings.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/NetPlayClient.h"
#include "Core/NetPlayServer.h"
#include "DolphinQt/GameList/GameListModel.h" #include "DolphinQt/GameList/GameListModel.h"
#include "DolphinQt/QtUtils/QueueOnObject.h" #include "DolphinQt/QtUtils/QueueOnObject.h"
@ -38,6 +40,8 @@ Settings::Settings()
SetCurrentUserStyle(GetCurrentUserStyle()); SetCurrentUserStyle(GetCurrentUserStyle());
} }
Settings::~Settings() = default;
Settings& Settings::Instance() Settings& Settings::Instance()
{ {
static Settings settings; static Settings settings;

11
Source/Core/DolphinQt/Settings.h
View File

@ -11,9 +11,6 @@
#include <QSettings> #include <QSettings>
#include <QVector> #include <QVector>
#include "Core/NetPlayClient.h"
#include "Core/NetPlayServer.h"
namespace Core namespace Core
{ {
enum class State; enum class State;
@ -24,6 +21,12 @@ namespace DiscIO
enum class Language; enum class Language;
} }
namespace NetPlay
{
class NetPlayClient;
class NetPlayServer;
}
class GameListModel; class GameListModel;
class InputConfig; class InputConfig;
class QFont; class QFont;
@ -39,6 +42,8 @@ public:
Settings(Settings&&) = delete; Settings(Settings&&) = delete;
Settings& operator=(Settings&&) = delete; Settings& operator=(Settings&&) = delete;
~Settings();
static Settings& Instance(); static Settings& Instance();
static QSettings& GetQSettings(); static QSettings& GetQSettings();