smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(serverConfigDialog):rename reject -> cancel

Browse source
This commit is contained in:
sithlord48 2026-08-13 04:24:50 -04:00 committed by Nick Bolton
parent 6d5601582d
commit 95923e0e90
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/gui/dialogs/ServerConfigDialog.cpp
View file

@ -99,7 +99,7 @@ void ServerConfigDialog::accept()
QDialog::accept(); QDialog::accept();
} }
void ServerConfigDialog::reject() void ServerConfigDialog::cancel()
{ {
serverConfig().setUseExternalConfig(m_originalServerConfigIsExternal); serverConfig().setUseExternalConfig(m_originalServerConfigIsExternal);
serverConfig().setConfigFile(m_originalServerConfigUsesExternalFile); serverConfig().setConfigFile(m_originalServerConfigUsesExternalFile);
@ -453,7 +453,7 @@ void ServerConfigDialog::loadFromConfig()
void ServerConfigDialog::initConnections() const void ServerConfigDialog::initConnections() const
{ {
connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &ServerConfigDialog::accept); 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->lblRemoveScreen, &TrashScreenWidget::screenRemoved, this, &ServerConfigDialog::onScreenRemoved);
connect(ui->btnNewHotkey, &QPushButton::clicked, this, &ServerConfigDialog::addHotkey); connect(ui->btnNewHotkey, &QPushButton::clicked, this, &ServerConfigDialog::addHotkey);
connect(ui->btnEditHotkey, &QPushButton::clicked, this, &ServerConfigDialog::editHotkey); connect(ui->btnEditHotkey, &QPushButton::clicked, this, &ServerConfigDialog::editHotkey);

3
src/lib/gui/dialogs/ServerConfigDialog.h
View file

@ -31,7 +31,7 @@ public:
public Q_SLOTS: public Q_SLOTS:
void accept() override; void accept() override;
void reject() override;
void message(const QString &message) void message(const QString &message)
{ {
m_message = message; m_message = message;
@ -90,6 +90,7 @@ protected:
} }
private: private:
void cancel();
void loadFromConfig(); void loadFromConfig();
void initConnections() const; void initConnections() const;
std::unique_ptr<Ui::ServerConfigDialog> ui; std::unique_ptr<Ui::ServerConfigDialog> ui;