From 30c7ff79dc3cfc1840552b095354f774253f40ae Mon Sep 17 00:00:00 2001 From: Cave Spectre Date: Sun, 25 Aug 2019 10:25:22 -0400 Subject: [PATCH] [GUI] Fix connectSlotsByName errors --- src/qt/pivx/settings/settingsbittoolwidget.cpp | 8 ++++---- src/qt/pivx/settings/settingsbittoolwidget.h | 4 ++-- src/qt/pivx/settings/settingsconsolewidget.cpp | 4 ++-- src/qt/pivx/settings/settingsconsolewidget.h | 2 +- .../pivx/settings/settingssignmessagewidgets.cpp | 14 +++++++------- src/qt/pivx/settings/settingssignmessagewidgets.h | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/qt/pivx/settings/settingsbittoolwidget.cpp b/src/qt/pivx/settings/settingsbittoolwidget.cpp index 36f2081e64bc9..fb89b6383b322 100644 --- a/src/qt/pivx/settings/settingsbittoolwidget.cpp +++ b/src/qt/pivx/settings/settingsbittoolwidget.cpp @@ -117,11 +117,11 @@ SettingsBitToolWidget::SettingsBitToolWidget(PIVXGUI* _window, QWidget *parent) ui->statusLabel_ENC->setStyleSheet("QLabel { color: transparent; }"); ui->statusLabel_DEC->setStyleSheet("QLabel { color: transparent; }"); - connect(ui->pushButtonEncrypt, &QPushButton::clicked, this, &SettingsBitToolWidget::on_encryptKeyButton_ENC_clicked); + connect(ui->pushButtonEncrypt, &QPushButton::clicked, this, &SettingsBitToolWidget::onEncryptKeyButtonENCClicked); connect(ui->pushButtonDecrypt, SIGNAL(clicked()), this, SLOT(onDecryptClicked())); connect(ui->pushButtonImport, SIGNAL(clicked()), this, SLOT(importAddressFromDecKey())); connect(btnContact, SIGNAL(triggered()), this, SLOT(onAddressesClicked())); - connect(ui->pushButtonClear, &QPushButton::clicked, this, &SettingsBitToolWidget::on_clear_all); + connect(ui->pushButtonClear, &QPushButton::clicked, this, &SettingsBitToolWidget::onClearAll); connect(ui->pushButtonDecryptClear, SIGNAL(clicked()), this, SLOT(onClearDecrypt())); } @@ -151,7 +151,7 @@ bool isValidPassphrase(QString strPassphrase, QString& strInvalid) return true; } -void SettingsBitToolWidget::on_encryptKeyButton_ENC_clicked() +void SettingsBitToolWidget::onEncryptKeyButtonENCClicked() { if (!walletModel) return; @@ -200,7 +200,7 @@ void SettingsBitToolWidget::on_encryptKeyButton_ENC_clicked() ui->statusLabel_ENC->setText(QString("") + tr("Address encrypted.") + QString("")); } -void SettingsBitToolWidget::on_clear_all(){ +void SettingsBitToolWidget::onClearAll(){ ui->addressIn_ENC->clear(); ui->passphraseIn_ENC->clear(); ui->encryptedKeyOut_ENC->clear(); diff --git a/src/qt/pivx/settings/settingsbittoolwidget.h b/src/qt/pivx/settings/settingsbittoolwidget.h index 920457b284402..3c4178aa01db8 100644 --- a/src/qt/pivx/settings/settingsbittoolwidget.h +++ b/src/qt/pivx/settings/settingsbittoolwidget.h @@ -26,8 +26,8 @@ class SettingsBitToolWidget : public PWidget public slots: void onEncryptSelected(bool isEncr); void setAddress_ENC(const QString& address); - void on_encryptKeyButton_ENC_clicked(); - void on_clear_all(); + void onEncryptKeyButtonENCClicked(); + void onClearAll(); void onClearDecrypt(); void onAddressesClicked(); void onDecryptClicked(); diff --git a/src/qt/pivx/settings/settingsconsolewidget.cpp b/src/qt/pivx/settings/settingsconsolewidget.cpp index d5cda5c6a520d..2652b5bbc804f 100644 --- a/src/qt/pivx/settings/settingsconsolewidget.cpp +++ b/src/qt/pivx/settings/settingsconsolewidget.cpp @@ -434,7 +434,7 @@ void SettingsConsoleWidget::message(int category, const QString& message, bool h ui->messagesWidget->append(out); } -void SettingsConsoleWidget::on_lineEdit_returnPressed() +void SettingsConsoleWidget::onLineEditReturnPressed() { QString cmd = ui->lineEdit->text(); ui->lineEdit->clear(); @@ -533,4 +533,4 @@ void SettingsConsoleWidget::onCommandsClicked() { HelpMessageDialog dlg(this, false); dlg.exec(); -} \ No newline at end of file +} diff --git a/src/qt/pivx/settings/settingsconsolewidget.h b/src/qt/pivx/settings/settingsconsolewidget.h index 861220dc630fb..4e8d288872d98 100644 --- a/src/qt/pivx/settings/settingsconsolewidget.h +++ b/src/qt/pivx/settings/settingsconsolewidget.h @@ -72,7 +72,7 @@ protected slots: void startExecutor(); private slots: - void on_lineEdit_returnPressed(); + void onLineEditReturnPressed(); }; diff --git a/src/qt/pivx/settings/settingssignmessagewidgets.cpp b/src/qt/pivx/settings/settingssignmessagewidgets.cpp index 9ebba322d0db5..24420017c0f0f 100644 --- a/src/qt/pivx/settings/settingssignmessagewidgets.cpp +++ b/src/qt/pivx/settings/settingssignmessagewidgets.cpp @@ -86,7 +86,7 @@ SettingsSignMessageWidgets::SettingsSignMessageWidgets(PIVXGUI* _window, QWidget connect(ui->pushButtonSave, SIGNAL(clicked()), this, SLOT(onGoClicked())); connect(btnContact, SIGNAL(triggered()), this, SLOT(onAddressesClicked())); - connect(ui->pushButtonClear, SIGNAL(clicked()), this, SLOT(on_clear_all())); + connect(ui->pushButtonClear, SIGNAL(clicked()), this, SLOT(onClearAll())); connect(ui->pushSign, &QPushButton::clicked, [this](){onModeSelected(true);}); connect(ui->pushVerify, &QPushButton::clicked, [this](){onModeSelected(false);}); } @@ -102,7 +102,7 @@ void SettingsSignMessageWidgets::onModeSelected(bool isSign){ void SettingsSignMessageWidgets::onGoClicked(){ if(isSign){ - on_signMessageButton_SM_clicked(); + onSignMessageButtonSMClicked(); } else { onVerifyMessage(); } @@ -130,7 +130,7 @@ void SettingsSignMessageWidgets::setAddress_SM(const QString& address){ ui->messageIn_SM->setFocus(); } -void SettingsSignMessageWidgets::on_addressBookButton_SM_clicked(){ +void SettingsSignMessageWidgets::onAddressBookButtonSMClicked(){ if (walletModel && walletModel->getAddressTableModel()) { AddressBookPage dlg(AddressBookPage::ForSelection, AddressBookPage::ReceivingTab, this); dlg.setModel(walletModel->getAddressTableModel()); @@ -140,18 +140,18 @@ void SettingsSignMessageWidgets::on_addressBookButton_SM_clicked(){ } } -void SettingsSignMessageWidgets::on_pasteButton_SM_clicked(){ +void SettingsSignMessageWidgets::onPasteButtonSMClicked(){ setAddress_SM(QApplication::clipboard()->text()); } -void SettingsSignMessageWidgets::on_clear_all() { +void SettingsSignMessageWidgets::onClearAll() { ui->addressIn_SM->clear(); ui->signatureOut_SM->clear(); ui->messageIn_SM->clear(); ui->statusLabel_SM->setStyleSheet("QLabel { color: transparent; }"); } -void SettingsSignMessageWidgets::on_signMessageButton_SM_clicked(){ +void SettingsSignMessageWidgets::onSignMessageButtonSMClicked(){ if (!walletModel) return; @@ -312,4 +312,4 @@ void SettingsSignMessageWidgets::resizeMenu(){ void SettingsSignMessageWidgets::resizeEvent(QResizeEvent *event){ resizeMenu(); QWidget::resizeEvent(event); -} \ No newline at end of file +} diff --git a/src/qt/pivx/settings/settingssignmessagewidgets.h b/src/qt/pivx/settings/settingssignmessagewidgets.h index 40bb104588fd8..37f41a51bc681 100644 --- a/src/qt/pivx/settings/settingssignmessagewidgets.h +++ b/src/qt/pivx/settings/settingssignmessagewidgets.h @@ -25,12 +25,12 @@ class SettingsSignMessageWidgets : public PWidget protected: void resizeEvent(QResizeEvent *event) override; public slots: - void on_signMessageButton_SM_clicked(); + void onSignMessageButtonSMClicked(); void onVerifyMessage(); - void on_pasteButton_SM_clicked(); - void on_addressBookButton_SM_clicked(); + void onPasteButtonSMClicked(); + void onAddressBookButtonSMClicked(); void onGoClicked(); - void on_clear_all(); + void onClearAll(); void onAddressesClicked(); void onModeSelected(bool isSign); void updateMode();