OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 13:30:15 +00:00
Code Issues Projects Releases Wiki Activity

cleanup code

Browse Source
This commit is contained in:
Steven Cherry 2016-06-22 20:43:49 -05:00 committed by Anon
parent f5a275e8c4
commit ce63acecf8
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/citra_qt/configure_input.cpp
View File

@ -52,7 +52,6 @@ ConfigureInput::ConfigureInput(QWidget* parent) :
ConfigureInput::~ConfigureInput() ConfigureInput::~ConfigureInput()
{ {
delete timer;
} }
/// Event handler for all button released() event. /// Event handler for all button released() event.

11
src/citra_qt/configure_input.h
View File

@ -29,22 +29,21 @@ public:
~ConfigureInput(); ~ConfigureInput();
void applyConfiguration(); void applyConfiguration();
public Q_SLOTS:
void handleClick();
void restoreDefaults();
private: private:
std::unique_ptr<Ui::ConfigureInput> ui; std::unique_ptr<Ui::ConfigureInput> ui;
std::map<Settings::NativeInput::Values, QPushButton*> input_mapping; std::map<Settings::NativeInput::Values, QPushButton*> input_mapping;
int key_pressed; int key_pressed;
QPushButton* changing_button = nullptr; /// button currently waiting for key press. QPushButton* changing_button = nullptr; /// button currently waiting for key press.
QString previous_mapping; QString previous_mapping;
QTimer* timer = new QTimer(); QTimer* timer = new QTimer(this);
void setConfiguration(); void setConfiguration();
void removeDuplicates(const QString& newValue); void removeDuplicates(const QString& newValue);
void keyPressEvent(QKeyEvent* event) override; void keyPressEvent(QKeyEvent* event) override;
QString getKeyName(int key_code) const; QString getKeyName(int key_code) const;
Qt::Key getKeyValue(const QString& text) const; Qt::Key getKeyValue(const QString& text) const;
private Q_SLOTS: void setKey();
void setKey(); private Q_SLOTS:
void handleClick();
void restoreDefaults();
}; };