From 95923e0e90da3113f3a6f866997960b26ae7cd3d Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 13 Aug 2026 04:24:50 -0400 Subject: [PATCH] refactor(serverConfigDialog):rename reject -> cancel --- src/lib/gui/dialogs/ServerConfigDialog.cpp | 4 ++-- src/lib/gui/dialogs/ServerConfigDialog.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp index b5f6dc894..0118c7d7b 100644 --- a/src/lib/gui/dialogs/ServerConfigDialog.cpp +++ b/src/lib/gui/dialogs/ServerConfigDialog.cpp @@ -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); diff --git a/src/lib/gui/dialogs/ServerConfigDialog.h b/src/lib/gui/dialogs/ServerConfigDialog.h index db999ee5c..1a633cad9 100644 --- a/src/lib/gui/dialogs/ServerConfigDialog.h +++ b/src/lib/gui/dialogs/ServerConfigDialog.h @@ -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;