summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorTilka <tilkax@gmail.com>2019-02-25 23:04:59 +0000
committerGitHub <noreply@github.com>2019-02-25 23:04:59 +0000
commit19673ce79af814ca3b77d7f8ea60458e564bfa51 (patch)
tree6ca0ed35fbac1e4c181a62300e2cd0c15e29cba1 /Source/Core
parentde3c8fee223deed10eebc3d0949bb82da8e07f69 (diff)
parent8396ad541b4a036153fc3d3a356f7b22287f3d6c (diff)
Merge pull request #7822 from Tilka/qt_includes
DolphinQt: clean up includes
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt/CheatsManager.h1
-rw-r--r--Source/Core/DolphinQt/DiscordJoinRequestDialog.h3
-rw-r--r--Source/Core/DolphinQt/GCMemcardManager.h1
-rw-r--r--Source/Core/DolphinQt/MenuBar.h3
-rw-r--r--Source/Core/DolphinQt/Settings.cpp1
-rw-r--r--Source/Core/DolphinQt/Settings.h2
-rw-r--r--Source/Core/DolphinQt/ToolBar.cpp1
-rw-r--r--Source/Core/DolphinQt/ToolBar.h4
-rw-r--r--Source/Core/UICommon/DiscordPresence.cpp2
9 files changed, 9 insertions, 9 deletions
diff --git a/Source/Core/DolphinQt/CheatsManager.h b/Source/Core/DolphinQt/CheatsManager.h
index 6992daec2a..9a2e43eafc 100644
--- a/Source/Core/DolphinQt/CheatsManager.h
+++ b/Source/Core/DolphinQt/CheatsManager.h
@@ -8,7 +8,6 @@
#include <vector>
#include <QDialog>
-#include <QString>
#include "Common/CommonTypes.h"
diff --git a/Source/Core/DolphinQt/DiscordJoinRequestDialog.h b/Source/Core/DolphinQt/DiscordJoinRequestDialog.h
index d9a7a8c9dd..e97581ee63 100644
--- a/Source/Core/DolphinQt/DiscordJoinRequestDialog.h
+++ b/Source/Core/DolphinQt/DiscordJoinRequestDialog.h
@@ -4,9 +4,10 @@
#pragma once
-#include <QDialog>
#include <ctime>
+#include <QDialog>
+
class QGridLayout;
class QPixmap;
diff --git a/Source/Core/DolphinQt/GCMemcardManager.h b/Source/Core/DolphinQt/GCMemcardManager.h
index ae20f5a700..e1579abe11 100644
--- a/Source/Core/DolphinQt/GCMemcardManager.h
+++ b/Source/Core/DolphinQt/GCMemcardManager.h
@@ -17,6 +17,7 @@ class QDialogButtonBox;
class QGroupBox;
class QLabel;
class QLineEdit;
+class QPixmap;
class QPushButton;
class QTableWidget;
class QTimer;
diff --git a/Source/Core/DolphinQt/MenuBar.h b/Source/Core/DolphinQt/MenuBar.h
index 1d731d240a..4cfa719028 100644
--- a/Source/Core/DolphinQt/MenuBar.h
+++ b/Source/Core/DolphinQt/MenuBar.h
@@ -8,10 +8,11 @@
#include <memory>
#include <string>
-#include <QMenu>
#include <QMenuBar>
#include <QPointer>
+class QMenu;
+
namespace Core
{
enum class State;
diff --git a/Source/Core/DolphinQt/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp
index 4d54b98b29..d8abe9b723 100644
--- a/Source/Core/DolphinQt/Settings.cpp
+++ b/Source/Core/DolphinQt/Settings.cpp
@@ -7,7 +7,6 @@
#include <QApplication>
#include <QDir>
#include <QFile>
-#include <QSettings>
#include <QSize>
#include "AudioCommon/AudioCommon.h"
diff --git a/Source/Core/DolphinQt/Settings.h b/Source/Core/DolphinQt/Settings.h
index ef03490b63..5a34ecbba1 100644
--- a/Source/Core/DolphinQt/Settings.h
+++ b/Source/Core/DolphinQt/Settings.h
@@ -9,7 +9,6 @@
#include <QFont>
#include <QObject>
#include <QSettings>
-#include <QVector>
namespace Core
{
@@ -29,7 +28,6 @@ class NetPlayServer;
class GameListModel;
class InputConfig;
-class QFont;
// UI settings to be stored in the config directory.
class Settings final : public QObject
diff --git a/Source/Core/DolphinQt/ToolBar.cpp b/Source/Core/DolphinQt/ToolBar.cpp
index d646f4e1a6..d6ba3e9c96 100644
--- a/Source/Core/DolphinQt/ToolBar.cpp
+++ b/Source/Core/DolphinQt/ToolBar.cpp
@@ -5,6 +5,7 @@
#include <algorithm>
#include <vector>
+#include <QAction>
#include <QIcon>
#include "Core/Core.h"
diff --git a/Source/Core/DolphinQt/ToolBar.h b/Source/Core/DolphinQt/ToolBar.h
index a6123654a3..04e7b35b50 100644
--- a/Source/Core/DolphinQt/ToolBar.h
+++ b/Source/Core/DolphinQt/ToolBar.h
@@ -4,10 +4,10 @@
#pragma once
-#include <QAction>
-#include <QLineEdit>
#include <QToolBar>
+class QAction;
+
namespace Core
{
enum class State;
diff --git a/Source/Core/UICommon/DiscordPresence.cpp b/Source/Core/UICommon/DiscordPresence.cpp
index dcaf8906c5..93aa2b47ed 100644
--- a/Source/Core/UICommon/DiscordPresence.cpp
+++ b/Source/Core/UICommon/DiscordPresence.cpp
@@ -189,7 +189,7 @@ void Init()
handlers.ready = HandleDiscordReady;
handlers.joinRequest = HandleDiscordJoinRequest;
handlers.joinGame = HandleDiscordJoin;
- // The number is the client ID for Dolphin, it's used for images and the appication name
+ // The number is the client ID for Dolphin, it's used for images and the application name
Discord_Initialize("455712169795780630", &handlers, 1, nullptr);
UpdateDiscordPresence();
#endif