Skip to content
Permalink
Browse files

Merge pull request #7822 from Tilka/qt_includes

DolphinQt: clean up includes
  • Loading branch information...
Tilka committed Feb 25, 2019
2 parents de3c8fe + 8396ad5 commit 19673ce79af814ca3b77d7f8ea60458e564bfa51
@@ -8,7 +8,6 @@
#include <vector>

#include <QDialog>
#include <QString>

#include "Common/CommonTypes.h"

@@ -4,9 +4,10 @@

#pragma once

#include <QDialog>
#include <ctime>

#include <QDialog>

class QGridLayout;
class QPixmap;

@@ -17,6 +17,7 @@ class QDialogButtonBox;
class QGroupBox;
class QLabel;
class QLineEdit;
class QPixmap;
class QPushButton;
class QTableWidget;
class QTimer;
@@ -8,10 +8,11 @@
#include <memory>
#include <string>

#include <QMenu>
#include <QMenuBar>
#include <QPointer>

class QMenu;

namespace Core
{
enum class State;
@@ -7,7 +7,6 @@
#include <QApplication>
#include <QDir>
#include <QFile>
#include <QSettings>
#include <QSize>

#include "AudioCommon/AudioCommon.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
@@ -5,6 +5,7 @@
#include <algorithm>
#include <vector>

#include <QAction>
#include <QIcon>

#include "Core/Core.h"
@@ -4,10 +4,10 @@

#pragma once

#include <QAction>
#include <QLineEdit>
#include <QToolBar>

class QAction;

namespace Core
{
enum class State;
@@ -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

0 comments on commit 19673ce

Please sign in to comment.
You can’t perform that action at this time.