summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLeo Lam <leolino.lam@gmail.com>2017-07-27 15:01:29 +0800
committerGitHub <noreply@github.com>2017-07-27 15:01:29 +0800
commitb140a6eb040109e2bc4e1648b68b5ae6f92ca063 (patch)
tree10fa2a68140a5624eb4578715fe9a34bff7e2c25 /Source/Core
parentbf7c0c80244375a9eafdef8aeee91fac6673a1b2 (diff)
parent80b938b403fd64c1c6e6beaa3a9baac1387590d6 (diff)
Merge pull request #5830 from lioncash/prototypes
DolphinQt2: Remove unimplemented prototypes
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp3
-rw-r--r--Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.h3
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h6
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h6
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp1
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/IOWindow.h2
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp1
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h2
-rw-r--r--Source/Core/DolphinQt2/Settings.h3
9 files changed, 0 insertions, 27 deletions
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp
index 94e316f364..f69c370815 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp
+++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp
@@ -5,10 +5,7 @@
#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
#include <QEvent>
-#include <QFormLayout>
-#include <QGroupBox>
#include <QLabel>
-#include <QVBoxLayout>
#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.h b/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.h
index 04e5a1afeb..46cdc8b971 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.h
+++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.h
@@ -21,9 +21,6 @@ signals:
void DescriptionAdded(QWidget* widget, const char* description);
protected:
- void AddWidget(const QString& name, QWidget* widget);
- void AddWidget(QWidget* widget);
-
void AddDescription(QWidget* widget, const char* description);
virtual void LoadSettings() = 0;
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h b/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h
index 2fd27d0a83..6614babf71 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h
+++ b/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h
@@ -23,13 +23,7 @@ public:
private:
void LoadSettings() override;
void SaveSettings() override;
- void CreateButtonsLayout();
- void CreateControlstickLayout();
- void CreateCStickLayout();
- void CreateTriggersLayout();
- void CreateDPadLayout();
void CreateMainLayout();
- void ConnectWidgets();
// Main
QHBoxLayout* m_main_layout;
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h b/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h
index 05d158caf1..467af56e56 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h
+++ b/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h
@@ -23,13 +23,7 @@ public:
private:
void LoadSettings() override;
void SaveSettings() override;
- void CreateButtonsLayout();
- void CreateControlstickLayout();
- void CreateCStickLayout();
- void CreateTriggersLayout();
- void CreateDPadLayout();
void CreateMainLayout();
- void ConnectWidgets();
// Main
QHBoxLayout* m_main_layout;
diff --git a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp
index 16f0186cb2..50e56b6bf2 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp
@@ -20,7 +20,6 @@
#include "Core/Core.h"
#include "DolphinQt2/Config/Mapping/MappingCommon.h"
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
#include "DolphinQt2/Config/Mapping/MappingWindow.h"
#include "InputCommon/ControlReference/ControlReference.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.h b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.h
index b59d84db65..05726eaa3d 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.h
+++ b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.h
@@ -43,8 +43,6 @@ public:
private:
void CreateMainLayout();
void ConnectWidgets();
- void LoadSettings();
- void SaveSettings();
void Update();
void OnDialogButtonPressed(QAbstractButton* button);
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
index 2885385f33..0d754850f3 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
@@ -16,7 +16,6 @@
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
#include "Core/Core.h"
-#include "Core/HW/GCPad.h"
#include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
#include "DolphinQt2/Config/Mapping/GCPadEmu.h"
#include "DolphinQt2/Config/Mapping/GCPadWiiU.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
index 760b47e151..3a7a308433 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
@@ -64,7 +64,6 @@ private:
void CreateResetLayout();
void CreateMainLayout();
void ConnectWidgets();
- void LoadSettings();
void SetLayoutComplex(bool is_complex);
void AddWidget(const QString& name, QWidget* widget);
@@ -76,7 +75,6 @@ private:
void OnLoadProfilePressed();
void OnSaveProfilePressed();
void OnDefaultFieldsPressed();
- void OnProfileChanged(int index);
void OnDeviceChanged(int index);
ControllerEmu::EmulatedController* m_controller = nullptr;
diff --git a/Source/Core/DolphinQt2/Settings.h b/Source/Core/DolphinQt2/Settings.h
index ca953b2d04..6283ecba27 100644
--- a/Source/Core/DolphinQt2/Settings.h
+++ b/Source/Core/DolphinQt2/Settings.h
@@ -8,7 +8,6 @@
#include <QVector>
#include "Common/NonCopyable.h"
-#include "Core/HW/SI/SI.h"
namespace DiscIO
{
@@ -30,12 +29,10 @@ public:
QString GetProfilesDir() const;
QVector<QString> GetProfiles(const InputConfig* config) const;
QString GetProfileINIPath(const InputConfig* config, const QString& name) const;
- bool IsInDevelopmentWarningEnabled() const;
// GameList
QStringList GetPaths() const;
void AddPath(const QString& path);
- void SetPaths(const QStringList& paths);
void RemovePath(const QString& path);
bool GetPreferredView() const;
void SetPreferredView(bool table);