Merge pull request #1842 from lioncash/slot

yuzu/configuration: Minor clean-up related changes
This commit is contained in:
bunnei 2018-12-03 17:12:01 -05:00 committed by GitHub
commit 76525013c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 14 deletions

View file

@ -16,15 +16,14 @@ class ConfigureAudio : public QWidget {
public: public:
explicit ConfigureAudio(QWidget* parent = nullptr); explicit ConfigureAudio(QWidget* parent = nullptr);
~ConfigureAudio(); ~ConfigureAudio() override;
void applyConfiguration(); void applyConfiguration();
void retranslateUi(); void retranslateUi();
public slots: private:
void updateAudioDevices(int sink_index); void updateAudioDevices(int sink_index);
private:
void setConfiguration(); void setConfiguration();
void setOutputSinkFromSinkID(); void setOutputSinkFromSinkID();
void setAudioDeviceFromDeviceID(); void setAudioDeviceFromDeviceID();

View file

@ -16,13 +16,12 @@ class ConfigureDebug : public QWidget {
public: public:
explicit ConfigureDebug(QWidget* parent = nullptr); explicit ConfigureDebug(QWidget* parent = nullptr);
~ConfigureDebug(); ~ConfigureDebug() override;
void applyConfiguration(); void applyConfiguration();
private: private:
void setConfiguration(); void setConfiguration();
private:
std::unique_ptr<Ui::ConfigureDebug> ui; std::unique_ptr<Ui::ConfigureDebug> ui;
}; };

View file

@ -18,13 +18,12 @@ class ConfigureDialog : public QDialog {
public: public:
explicit ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry); explicit ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry);
~ConfigureDialog(); ~ConfigureDialog() override;
void applyConfiguration(); void applyConfiguration();
private: private:
void setConfiguration(); void setConfiguration();
private:
std::unique_ptr<Ui::ConfigureDialog> ui; std::unique_ptr<Ui::ConfigureDialog> ui;
}; };

View file

@ -16,7 +16,7 @@ class ConfigureGameList : public QWidget {
public: public:
explicit ConfigureGameList(QWidget* parent = nullptr); explicit ConfigureGameList(QWidget* parent = nullptr);
~ConfigureGameList(); ~ConfigureGameList() override;
void applyConfiguration(); void applyConfiguration();

View file

@ -18,7 +18,7 @@ class ConfigureGeneral : public QWidget {
public: public:
explicit ConfigureGeneral(QWidget* parent = nullptr); explicit ConfigureGeneral(QWidget* parent = nullptr);
~ConfigureGeneral(); ~ConfigureGeneral() override;
void PopulateHotkeyList(const HotkeyRegistry& registry); void PopulateHotkeyList(const HotkeyRegistry& registry);
void applyConfiguration(); void applyConfiguration();

View file

@ -16,14 +16,13 @@ class ConfigureGraphics : public QWidget {
public: public:
explicit ConfigureGraphics(QWidget* parent = nullptr); explicit ConfigureGraphics(QWidget* parent = nullptr);
~ConfigureGraphics(); ~ConfigureGraphics() override;
void applyConfiguration(); void applyConfiguration();
private: private:
void setConfiguration(); void setConfiguration();
private:
std::unique_ptr<Ui::ConfigureGraphics> ui; std::unique_ptr<Ui::ConfigureGraphics> ui;
QColor bg_color; QColor bg_color;
}; };

View file

@ -88,6 +88,8 @@ ConfigureInput::ConfigureInput(QWidget* parent)
[this] { CallConfigureDialog<ConfigureTouchscreenAdvanced>(*this); }); [this] { CallConfigureDialog<ConfigureTouchscreenAdvanced>(*this); });
} }
ConfigureInput::~ConfigureInput() = default;
void ConfigureInput::OnDockedModeChanged(bool last_state, bool new_state) { void ConfigureInput::OnDockedModeChanged(bool last_state, bool new_state) {
if (ui->use_docked_mode->isChecked() && ui->handheld_connected->isChecked()) { if (ui->use_docked_mode->isChecked() && ui->handheld_connected->isChecked()) {
ui->handheld_connected->setChecked(false); ui->handheld_connected->setChecked(false);

View file

@ -25,6 +25,7 @@ class ConfigureInput : public QWidget {
public: public:
explicit ConfigureInput(QWidget* parent = nullptr); explicit ConfigureInput(QWidget* parent = nullptr);
~ConfigureInput() override;
/// Save all button configurations to settings file /// Save all button configurations to settings file
void applyConfiguration(); void applyConfiguration();

View file

@ -17,18 +17,17 @@ class ConfigureWeb : public QWidget {
public: public:
explicit ConfigureWeb(QWidget* parent = nullptr); explicit ConfigureWeb(QWidget* parent = nullptr);
~ConfigureWeb(); ~ConfigureWeb() override;
void applyConfiguration(); void applyConfiguration();
void retranslateUi(); void retranslateUi();
public slots: private:
void RefreshTelemetryID(); void RefreshTelemetryID();
void OnLoginChanged(); void OnLoginChanged();
void VerifyLogin(); void VerifyLogin();
void OnLoginVerified(); void OnLoginVerified();
private:
void setConfiguration(); void setConfiguration();
bool user_verified = true; bool user_verified = true;