refactor(serverConfigDialog):rename reject -> cancel
This commit is contained in:
parent
6d5601582d
commit
95923e0e90
2 changed files with 4 additions and 3 deletions
|
|
@ -99,7 +99,7 @@ void ServerConfigDialog::accept()
|
|||
QDialog::accept();
|
||||
}
|
||||
|
||||
void ServerConfigDialog::reject()
|
||||
void ServerConfigDialog::cancel()
|
||||
{
|
||||
serverConfig().setUseExternalConfig(m_originalServerConfigIsExternal);
|
||||
serverConfig().setConfigFile(m_originalServerConfigUsesExternalFile);
|
||||
|
|
@ -453,7 +453,7 @@ void ServerConfigDialog::loadFromConfig()
|
|||
void ServerConfigDialog::initConnections() const
|
||||
{
|
||||
connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &ServerConfigDialog::accept);
|
||||
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &ServerConfigDialog::reject);
|
||||
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &ServerConfigDialog::cancel);
|
||||
connect(ui->lblRemoveScreen, &TrashScreenWidget::screenRemoved, this, &ServerConfigDialog::onScreenRemoved);
|
||||
connect(ui->btnNewHotkey, &QPushButton::clicked, this, &ServerConfigDialog::addHotkey);
|
||||
connect(ui->btnEditHotkey, &QPushButton::clicked, this, &ServerConfigDialog::editHotkey);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public:
|
|||
|
||||
public Q_SLOTS:
|
||||
void accept() override;
|
||||
void reject() override;
|
||||
|
||||
void message(const QString &message)
|
||||
{
|
||||
m_message = message;
|
||||
|
|
@ -90,6 +90,7 @@ protected:
|
|||
}
|
||||
|
||||
private:
|
||||
void cancel();
|
||||
void loadFromConfig();
|
||||
void initConnections() const;
|
||||
std::unique_ptr<Ui::ServerConfigDialog> ui;
|
||||
|
|
|
|||
Loading…
Reference in a new issue