Skip to content

Commit

Permalink
[GUI] Fix connectSlotsByName errors
Browse files Browse the repository at this point in the history
  • Loading branch information
CaveSpectre11 committed Aug 25, 2019
1 parent ec0b1c9 commit 30c7ff7
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions src/qt/pivx/settings/settingsbittoolwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}

Expand Down Expand Up @@ -151,7 +151,7 @@ bool isValidPassphrase(QString strPassphrase, QString& strInvalid)
return true;
}

void SettingsBitToolWidget::on_encryptKeyButton_ENC_clicked()
void SettingsBitToolWidget::onEncryptKeyButtonENCClicked()
{
if (!walletModel)
return;
Expand Down Expand Up @@ -200,7 +200,7 @@ void SettingsBitToolWidget::on_encryptKeyButton_ENC_clicked()
ui->statusLabel_ENC->setText(QString("<nobr>") + tr("Address encrypted.") + QString("</nobr>"));
}

void SettingsBitToolWidget::on_clear_all(){
void SettingsBitToolWidget::onClearAll(){
ui->addressIn_ENC->clear();
ui->passphraseIn_ENC->clear();
ui->encryptedKeyOut_ENC->clear();
Expand Down
4 changes: 2 additions & 2 deletions src/qt/pivx/settings/settingsbittoolwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/qt/pivx/settings/settingsconsolewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -533,4 +533,4 @@ void SettingsConsoleWidget::onCommandsClicked() {
HelpMessageDialog dlg(this, false);
dlg.exec();

}
}
2 changes: 1 addition & 1 deletion src/qt/pivx/settings/settingsconsolewidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ protected slots:
void startExecutor();

private slots:
void on_lineEdit_returnPressed();
void onLineEditReturnPressed();


};
Expand Down
14 changes: 7 additions & 7 deletions src/qt/pivx/settings/settingssignmessagewidgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);});
}
Expand All @@ -102,7 +102,7 @@ void SettingsSignMessageWidgets::onModeSelected(bool isSign){

void SettingsSignMessageWidgets::onGoClicked(){
if(isSign){
on_signMessageButton_SM_clicked();
onSignMessageButtonSMClicked();
} else {
onVerifyMessage();
}
Expand Down Expand Up @@ -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());
Expand All @@ -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;
Expand Down Expand Up @@ -312,4 +312,4 @@ void SettingsSignMessageWidgets::resizeMenu(){
void SettingsSignMessageWidgets::resizeEvent(QResizeEvent *event){
resizeMenu();
QWidget::resizeEvent(event);
}
}
8 changes: 4 additions & 4 deletions src/qt/pivx/settings/settingssignmessagewidgets.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 30c7ff7

Please sign in to comment.