ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5830 from lioncash/prototypes 

DolphinQt2: Remove unimplemented prototypes
This commit is contained in:
Leo Lam 2017-07-27 15:01:29 +08:00 committed by GitHub
parent bf7c0c8024 80b938b403
commit b140a6eb04
9 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp
View File

@ -5,10 +5,7 @@
#include "DolphinQt2/Config/Graphics/GraphicsWidget.h" #include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
#include <QEvent> #include <QEvent>
#include <QFormLayout>
#include <QGroupBox>
#include <QLabel> #include <QLabel>
#include <QVBoxLayout>
#include "DolphinQt2/Config/Graphics/GraphicsWindow.h" #include "DolphinQt2/Config/Graphics/GraphicsWindow.h"

3
Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.h
View File

@ -21,9 +21,6 @@ signals:
void DescriptionAdded(QWidget* widget, const char* description); void DescriptionAdded(QWidget* widget, const char* description);
protected: protected:
void AddWidget(const QString& name, QWidget* widget);
void AddWidget(QWidget* widget);
void AddDescription(QWidget* widget, const char* description); void AddDescription(QWidget* widget, const char* description);
virtual void LoadSettings() = 0; virtual void LoadSettings() = 0;

6
Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h
View File

@ -23,13 +23,7 @@ public:
private: private:
void LoadSettings() override; void LoadSettings() override;
void SaveSettings() override; void SaveSettings() override;
void CreateButtonsLayout();
void CreateControlstickLayout();
void CreateCStickLayout();
void CreateTriggersLayout();
void CreateDPadLayout();
void CreateMainLayout(); void CreateMainLayout();
void ConnectWidgets();
// Main // Main
QHBoxLayout* m_main_layout; QHBoxLayout* m_main_layout;

6
Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h
View File

@ -23,13 +23,7 @@ public:
private: private:
void LoadSettings() override; void LoadSettings() override;
void SaveSettings() override; void SaveSettings() override;
void CreateButtonsLayout();
void CreateControlstickLayout();
void CreateCStickLayout();
void CreateTriggersLayout();
void CreateDPadLayout();
void CreateMainLayout(); void CreateMainLayout();
void ConnectWidgets();
// Main // Main
QHBoxLayout* m_main_layout; QHBoxLayout* m_main_layout;

1
Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp
View File

@ -20,7 +20,6 @@
#include "Core/Core.h" #include "Core/Core.h"
#include "DolphinQt2/Config/Mapping/MappingCommon.h" #include "DolphinQt2/Config/Mapping/MappingCommon.h"
#include "DolphinQt2/Config/Mapping/MappingWidget.h"
#include "DolphinQt2/Config/Mapping/MappingWindow.h" #include "DolphinQt2/Config/Mapping/MappingWindow.h"
#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControlReference/ControlReference.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"

2
Source/Core/DolphinQt2/Config/Mapping/IOWindow.h
View File

@ -43,8 +43,6 @@ public:
private: private:
void CreateMainLayout(); void CreateMainLayout();
void ConnectWidgets(); void ConnectWidgets();
void LoadSettings();
void SaveSettings();
void Update(); void Update();
void OnDialogButtonPressed(QAbstractButton* button); void OnDialogButtonPressed(QAbstractButton* button);

1
Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
View File

@ -16,7 +16,6 @@
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/IniFile.h" #include "Common/IniFile.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/GCPad.h"
#include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h" #include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
#include "DolphinQt2/Config/Mapping/GCPadEmu.h" #include "DolphinQt2/Config/Mapping/GCPadEmu.h"
#include "DolphinQt2/Config/Mapping/GCPadWiiU.h" #include "DolphinQt2/Config/Mapping/GCPadWiiU.h"

2
Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
View File

@ -64,7 +64,6 @@ private:
void CreateResetLayout(); void CreateResetLayout();
void CreateMainLayout(); void CreateMainLayout();
void ConnectWidgets(); void ConnectWidgets();
void LoadSettings();
void SetLayoutComplex(bool is_complex); void SetLayoutComplex(bool is_complex);
void AddWidget(const QString& name, QWidget* widget); void AddWidget(const QString& name, QWidget* widget);
@ -76,7 +75,6 @@ private:
void OnLoadProfilePressed(); void OnLoadProfilePressed();
void OnSaveProfilePressed(); void OnSaveProfilePressed();
void OnDefaultFieldsPressed(); void OnDefaultFieldsPressed();
void OnProfileChanged(int index);
void OnDeviceChanged(int index); void OnDeviceChanged(int index);
ControllerEmu::EmulatedController* m_controller = nullptr; ControllerEmu::EmulatedController* m_controller = nullptr;

3
Source/Core/DolphinQt2/Settings.h
View File

@ -8,7 +8,6 @@
#include <QVector> #include <QVector>
#include "Common/NonCopyable.h" #include "Common/NonCopyable.h"
#include "Core/HW/SI/SI.h"
namespace DiscIO namespace DiscIO
{ {
@ -30,12 +29,10 @@ public:
QString GetProfilesDir() const; QString GetProfilesDir() const;
QVector<QString> GetProfiles(const InputConfig* config) const; QVector<QString> GetProfiles(const InputConfig* config) const;
QString GetProfileINIPath(const InputConfig* config, const QString& name) const; QString GetProfileINIPath(const InputConfig* config, const QString& name) const;
bool IsInDevelopmentWarningEnabled() const;
// GameList // GameList
QStringList GetPaths() const; QStringList GetPaths() const;
void AddPath(const QString& path); void AddPath(const QString& path);
void SetPaths(const QStringList& paths);
void RemovePath(const QString& path); void RemovePath(const QString& path);
bool GetPreferredView() const; bool GetPreferredView() const;
void SetPreferredView(bool table); void SetPreferredView(bool table);