DolphinQt/Settings: Replace includes with forward declarations

Avoids dragging in netplay-related headers where they aren't explicitly
necessary.
This commit is contained in:
Lioncash 2018-07-09 00:45:27 -04:00
parent 9487892c18
commit b4d91cc612
4 changed files with 20 additions and 6 deletions

View File

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

View File

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

View File

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

View File

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