Permalink
Browse files

Merge pull request #7236 from lioncash/fwd

DolphinQt/Settings: Replace includes with forward declarations
  • Loading branch information...
spycrab committed Jul 10, 2018
2 parents 4e54cce + b4d91cc commit b9960777a72c66f3b217669b554254ce6ddb3664
@@ -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)
@@ -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);
@@ -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;
@@ -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 @@ class Settings final : public QObject
Settings(Settings&&) = delete;
Settings& operator=(Settings&&) = delete;
~Settings();
static Settings& Instance();
static QSettings& GetQSettings();

0 comments on commit b996077

Please sign in to comment.