Merge pull request #42 from div72/fix_connects

qt: use QT5 connect syntax

src/qt/addressbookpage.cpp

@@ -43,7 +43,7 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget* parent)
     switch(mode)
     {
     case ForSending:
-        connect(ui->tableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(accept()));
+        connect(ui->tableView, &QTableView::doubleClicked, this, &QDialog::accept);
         ui->tableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
         ui->tableView->setFocus();
         break;
@@ -89,18 +89,18 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget* parent)
         contextMenu->addAction(verifyMessageAction);
 
     // Connect signals for context menu actions
-    connect(copyAddressAction, SIGNAL(triggered()), this, SLOT(on_copyToClipboardButton_clicked()));
-    connect(copyLabelAction, SIGNAL(triggered()), this, SLOT(onCopyLabelAction()));
-    connect(editAction, SIGNAL(triggered()), this, SLOT(onEditAction()));
-    connect(deleteAction, SIGNAL(triggered()), this, SLOT(on_deleteButton_clicked()));
-    connect(showQRCodeAction, SIGNAL(triggered()), this, SLOT(on_showQRCodeButton_clicked()));
-    connect(signMessageAction, SIGNAL(triggered()), this, SLOT(on_signMessageButton_clicked()));
-    connect(verifyMessageAction, SIGNAL(triggered()), this, SLOT(on_verifyMessageButton_clicked()));
+    connect(copyAddressAction, &QAction::triggered, this, &AddressBookPage::on_copyToClipboardButton_clicked);
+    connect(copyLabelAction, &QAction::triggered, this, &AddressBookPage::onCopyLabelAction);
+    connect(editAction, &QAction::triggered, this, &AddressBookPage::onEditAction);
+    connect(deleteAction, &QAction::triggered, this, &AddressBookPage::on_deleteButton_clicked);
+    connect(showQRCodeAction, &QAction::triggered, this, &AddressBookPage::on_showQRCodeButton_clicked);
+    connect(signMessageAction, &QAction::triggered, this, &AddressBookPage::on_signMessageButton_clicked);
+    connect(verifyMessageAction, &QAction::triggered, this, &AddressBookPage::on_verifyMessageButton_clicked);
 
-    connect(ui->tableView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextualMenu(QPoint)));
+    connect(ui->tableView, &QWidget::customContextMenuRequested, this, &AddressBookPage::contextualMenu);
 
     // Pass through accept action from button box
-    connect(ui->okayButtonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(ui->okayButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
 }
 
 AddressBookPage::~AddressBookPage()
@@ -148,12 +148,12 @@ void AddressBookPage::setModel(AddressTableModel *model)
     ui->tableView->horizontalHeader()->setSectionResizeMode(AddressTableModel::Address, QHeaderView::ResizeToContents);
     ui->tableView->horizontalHeader()->resizeSection(AddressTableModel::Address, 320);
 
-    connect(ui->tableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
-            this, SLOT(selectionChanged()));
+    connect(ui->tableView->selectionModel(), &QItemSelectionModel::selectionChanged,
+            this, &AddressBookPage::selectionChanged);
 
     // Select row for newly created address
-    connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
-            this, SLOT(selectNewAddress(QModelIndex,int,int)));
+    connect(model, &AddressTableModel::rowsInserted,
+            this, &AddressBookPage::selectNewAddress);
 
     selectionChanged();
 }

src/qt/askpassphrasedialog.cpp

@@ -68,9 +68,9 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent)
     }
 
     textChanged();
-    connect(ui->oldPassphraseEdit, SIGNAL(textChanged(QString)), this, SLOT(textChanged()));
-    connect(ui->newPassphraseEdit, SIGNAL(textChanged(QString)), this, SLOT(textChanged()));
-    connect(ui->repeatNewPassphraseEdit, SIGNAL(textChanged(QString)), this, SLOT(textChanged()));
+    connect(ui->oldPassphraseEdit, &QLineEdit::textChanged, this, &AskPassphraseDialog::textChanged);
+    connect(ui->newPassphraseEdit, &QLineEdit::textChanged, this, &AskPassphraseDialog::textChanged);
+    connect(ui->repeatNewPassphraseEdit, &QLineEdit::textChanged, this, &AskPassphraseDialog::textChanged);
 }
 
 AskPassphraseDialog::~AskPassphraseDialog()

src/qt/bitcoinamountfield.cpp

@@ -37,8 +37,10 @@ BitcoinAmountField::BitcoinAmountField(QWidget* parent) : QWidget(parent), amoun
     setFocusProxy(amount);
 
     // If one of the widgets changes, the combined content changes as well
-    connect(amount, SIGNAL(valueChanged(QString)), this, SIGNAL(textChanged()));
-    connect(unit, SIGNAL(currentIndexChanged(int)), this, SLOT(unitChanged(int)));
+    connect(amount, static_cast<void (QDoubleSpinBox::*)(const QString&)>(&QDoubleSpinBox::textChanged), this, &BitcoinAmountField::textChanged);
+    connect(unit, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &BitcoinAmountField::unitChanged);
+
+
 
     // Set default based on configuration
     unitChanged(unit->currentIndex());

src/qt/bitcoingui.h

@@ -277,7 +277,7 @@ private slots:
     void showNormalIfMinimized(bool fToggleHidden = false);
     /** Show window if hidden, unminimize when minimized, rise when obscured */
     void showNormalIfMinimizedDefault();
-    /** simply calls showNormalIfMinimized(true) for use in SLOT() macro */
+    /** simply calls showNormalIfMinimized(true) for use in connect */
     void toggleHidden();
 
     void updateWeight();

src/qt/clientmodel.cpp

@@ -40,7 +40,7 @@ ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent)
     pollTimer = new QTimer(this);
     pollTimer->setInterval(MODEL_UPDATE_DELAY);
     pollTimer->start();
-    connect(pollTimer, SIGNAL(timeout()), this, SLOT(updateTimer()));
+    connect(pollTimer, &QTimer::timeout, this, &ClientModel::updateTimer);
 
     subscribeToCoreSignals();
 }

src/qt/coincontroldialog.cpp

@@ -60,13 +60,13 @@ CoinControlDialog::CoinControlDialog(QWidget* parent, CCoinControl* coinControl,
     //contextMenu->addAction(unlockAction);
 
     // context menu signals
-    connect(ui->treeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showMenu(QPoint)));
-    connect(copyAddressAction, SIGNAL(triggered()), this, SLOT(copyAddress()));
-    connect(copyLabelAction, SIGNAL(triggered()), this, SLOT(copyLabel()));
-    connect(copyAmountAction, SIGNAL(triggered()), this, SLOT(copyAmount()));
-    connect(copyTransactionHashAction, SIGNAL(triggered()), this, SLOT(copyTransactionHash()));
-    //connect(lockAction, SIGNAL(triggered()), this, SLOT(lockCoin()));
-    //connect(unlockAction, SIGNAL(triggered()), this, SLOT(unlockCoin()));
+    connect(ui->treeWidget, &QWidget::customContextMenuRequested, this, &CoinControlDialog::showMenu);
+    connect(copyAddressAction, &QAction::triggered, this, &CoinControlDialog::copyAddress);
+    connect(copyLabelAction, &QAction::triggered, this, &CoinControlDialog::copyLabel);
+    connect(copyAmountAction, &QAction::triggered, this, &CoinControlDialog::copyAmount);
+    connect(copyTransactionHashAction, &QAction::triggered, this, &CoinControlDialog::copyTransactionHash);
+    //connect(lockAction, &QAction::triggered, this, &CoinControlDialog::lockCoin);
+    //connect(unlockAction, &QAction::triggered, this, &CoinControlDialog::unlockCoin);
 
     // clipboard actions
     QAction *clipboardQuantityAction = new QAction(tr("Copy quantity"), this);
@@ -78,14 +78,14 @@ CoinControlDialog::CoinControlDialog(QWidget* parent, CCoinControl* coinControl,
     QAction *clipboardLowOutputAction = new QAction(tr("Copy low output"), this);
     QAction *clipboardChangeAction = new QAction(tr("Copy change"), this);
 
-    connect(clipboardQuantityAction, SIGNAL(triggered()), this, SLOT(clipboardQuantity()));
-    connect(clipboardAmountAction, SIGNAL(triggered()), this, SLOT(clipboardAmount()));
-    connect(clipboardFeeAction, SIGNAL(triggered()), this, SLOT(clipboardFee()));
-    connect(clipboardAfterFeeAction, SIGNAL(triggered()), this, SLOT(clipboardAfterFee()));
-    connect(clipboardBytesAction, SIGNAL(triggered()), this, SLOT(clipboardBytes()));
-    connect(clipboardPriorityAction, SIGNAL(triggered()), this, SLOT(clipboardPriority()));
-    connect(clipboardLowOutputAction, SIGNAL(triggered()), this, SLOT(clipboardLowOutput()));
-    connect(clipboardChangeAction, SIGNAL(triggered()), this, SLOT(clipboardChange()));
+    connect(clipboardQuantityAction, &QAction::triggered, this, &CoinControlDialog::clipboardQuantity);
+    connect(clipboardAmountAction, &QAction::triggered, this, &CoinControlDialog::clipboardAmount);
+    connect(clipboardFeeAction, &QAction::triggered, this, &CoinControlDialog::clipboardFee);
+    connect(clipboardAfterFeeAction, &QAction::triggered, this, &CoinControlDialog::clipboardAfterFee);
+    connect(clipboardBytesAction, &QAction::triggered, this, &CoinControlDialog::clipboardBytes);
+    connect(clipboardPriorityAction, &QAction::triggered, this, &CoinControlDialog::clipboardPriority);
+    connect(clipboardLowOutputAction, &QAction::triggered, this, &CoinControlDialog::clipboardLowOutput);
+    connect(clipboardChangeAction, &QAction::triggered, this, &CoinControlDialog::clipboardChange);
 
     ui->coinControlQuantityLabel->addAction(clipboardQuantityAction);
     ui->coinControlAmountLabel->addAction(clipboardAmountAction);
@@ -97,33 +97,33 @@ CoinControlDialog::CoinControlDialog(QWidget* parent, CCoinControl* coinControl,
     ui->coinControlChangeLabel->addAction(clipboardChangeAction);
 
     // toggle tree/list mode
-    connect(ui->treeModeRadioButton, SIGNAL(toggled(bool)), this, SLOT(treeModeRadioButton(bool)));
-    connect(ui->listModeRadioButton, SIGNAL(toggled(bool)), this, SLOT(listModeRadioButton(bool)));
+    connect(ui->treeModeRadioButton, &QRadioButton::toggled, this, &CoinControlDialog::treeModeRadioButton);
+    connect(ui->listModeRadioButton, &QRadioButton::toggled, this, &CoinControlDialog::listModeRadioButton);
 
     // click on checkbox
-    connect(ui->treeWidget, SIGNAL(itemChanged( QTreeWidgetItem*, int)), this, SLOT(viewItemChanged( QTreeWidgetItem*, int)));
+    connect(ui->treeWidget, &QTreeWidget::itemChanged, this, &CoinControlDialog::viewItemChanged);
 
     // click on header
     ui->treeWidget->header()->setSectionsClickable(true);
-    connect(ui->treeWidget->header(), SIGNAL(sectionClicked(int)), this, SLOT(headerSectionClicked(int)));
+    connect(ui->treeWidget->header(), &QHeaderView::sectionClicked, this, &CoinControlDialog::headerSectionClicked);
 
     // ok button
-    connect(ui->buttonBox, SIGNAL(clicked( QAbstractButton*)), this, SLOT(buttonBoxClicked(QAbstractButton*)));
+    connect(ui->buttonBox, &QDialogButtonBox::clicked, this, &CoinControlDialog::buttonBoxClicked);
 
     // (un)select all
-    connect(ui->selectAllPushButton, SIGNAL(clicked()), this, SLOT(buttonSelectAllClicked()));
+    connect(ui->selectAllPushButton, &QPushButton::clicked, this, &CoinControlDialog::buttonSelectAllClicked);
 
     // filter/consolidate button interaction
-    connect(ui->maxMinOutputValue, SIGNAL(textChanged()), this, SLOT(maxMinOutputValueChanged()));
+    connect(ui->maxMinOutputValue, &BitcoinAmountField::textChanged, this, &CoinControlDialog::maxMinOutputValueChanged);
 
     // filter mode
-    connect(ui->filterModePushButton, SIGNAL(clicked()), this, SLOT(buttonFilterModeClicked()));
+    connect(ui->filterModePushButton, &QPushButton::clicked, this, &CoinControlDialog::buttonFilterModeClicked);
 
     // filter
-    connect(ui->filterPushButton, SIGNAL(clicked()), this, SLOT(buttonFilterClicked()));
+    connect(ui->filterPushButton, &QPushButton::clicked, this, &CoinControlDialog::buttonFilterClicked);
 
     // consolidate
-    connect(ui->consolidateButton, SIGNAL(clicked()), this, SLOT(buttonConsolidateClicked()));
+    connect(ui->consolidateButton, &QPushButton::clicked, this, &CoinControlDialog::buttonConsolidateClicked);
 
     ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 150);
     ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 170);
@@ -393,8 +393,8 @@ void CoinControlDialog::buttonConsolidateClicked()
 
     if (culled_inputs) consolidateUnspentDialog.SetOutputWarningVisible(true);
 
-    connect(&consolidateUnspentDialog, SIGNAL(selectedConsolidationAddressSignal(std::pair<QString, QString>)),
-            this, SLOT(selectedConsolidationAddressSlot(std::pair<QString, QString>)));
+    connect(&consolidateUnspentDialog, &ConsolidateUnspentDialog::selectedConsolidationAddressSignal,
+            this, &CoinControlDialog::selectedConsolidationAddressSlot);
 
     consolidateUnspentDialog.exec();
 }

src/qt/consolidateunspentdialog.cpp

@@ -1,5 +1,6 @@
 #include "consolidateunspentdialog.h"
 #include "qt/decoration.h"
+#include <QAbstractButton>
 #include "ui_consolidateunspentdialog.h"
 
 #include "util.h"
@@ -18,10 +19,10 @@ ConsolidateUnspentDialog::ConsolidateUnspentDialog(QWidget *parent, size_t input
     ui->addressTableWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 
     // ok button
-    connect(ui->buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(buttonBoxClicked(QAbstractButton*)));
+    connect(ui->buttonBox, &QDialogButtonBox::clicked, this, &ConsolidateUnspentDialog::buttonBoxClicked);
 
     // destination address selection
-    connect(ui->addressTableWidget, SIGNAL(itemSelectionChanged()), this, SLOT(addressSelectionChanged()));
+    connect(ui->addressTableWidget, &QTableWidget::itemSelectionChanged, this, &ConsolidateUnspentDialog::addressSelectionChanged);
 
     ui->outputLimitWarningLabel->setText(tr("Note: The number of inputs selected for consolidation has been "
                                                  "limited to %1 to prevent a transaction failure due to too many "

src/qt/consolidateunspentwizard.cpp

@@ -23,15 +23,16 @@ ConsolidateUnspentWizard::ConsolidateUnspentWizard(QWidget *parent,
     ui->selectInputsPage->setCoinControl(coinControl);
     ui->selectInputsPage->setPayAmounts(payAmounts);
 
-    connect(ui->selectInputsPage, SIGNAL(setAddressListSignal(std::map<QString, QString>)),
-            ui->selectDestinationPage, SLOT(SetAddressList(const std::map<QString, QString>)));
+    connect(ui->selectInputsPage, &ConsolidateUnspentWizardSelectInputsPage::setAddressListSignal,
+            ui->selectDestinationPage, &ConsolidateUnspentWizardSelectDestinationPage::SetAddressList);
 
-    connect(ui->selectInputsPage, SIGNAL(setDefaultAddressSignal(QString)),
-            ui->selectDestinationPage, SLOT(setDefaultAddressSelection(QString)));
+    connect(ui->selectInputsPage, &ConsolidateUnspentWizardSelectInputsPage::setDefaultAddressSignal,
+            ui->selectDestinationPage, &ConsolidateUnspentWizardSelectDestinationPage::setDefaultAddressSelection);
 
-    connect(this->button(QWizard::FinishButton), SIGNAL(clicked()), ui->sendPage, SLOT(onFinishButtonClicked()));
-    connect(ui->sendPage, SIGNAL(selectedConsolidationRecipientSignal(SendCoinsRecipient)),
-            this, SIGNAL(selectedConsolidationRecipientSignal(SendCoinsRecipient)));
+    connect(this->button(QWizard::FinishButton), &QAbstractButton::clicked,
+            ui->sendPage, &ConsolidateUnspentWizardSendPage::onFinishButtonClicked);
+    connect(ui->sendPage, &ConsolidateUnspentWizardSendPage::selectedConsolidationRecipientSignal,
+            this, &ConsolidateUnspentWizard::selectedConsolidationRecipientSignal);
 }
 
 ConsolidateUnspentWizard::~ConsolidateUnspentWizard()

src/qt/consolidateunspentwizardselectdestinationpage.cpp

@@ -12,7 +12,8 @@ ConsolidateUnspentWizardSelectDestinationPage::ConsolidateUnspentWizardSelectDes
     ui->addressTableWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 
     // destination address selection
-    connect(ui->addressTableWidget, SIGNAL(itemSelectionChanged()), this, SLOT(addressSelectionChanged()));
+    connect(ui->addressTableWidget, &QTableWidget::itemSelectionChanged,
+            this, &ConsolidateUnspentWizardSelectDestinationPage::addressSelectionChanged);
 
     ui->isCompleteCheckBox->hide();
 

src/qt/consolidateunspentwizardselectinputspage.cpp

@@ -23,27 +23,27 @@ ConsolidateUnspentWizardSelectInputsPage::ConsolidateUnspentWizardSelectInputsPa
     ui->setupUi(this);
 
     // toggle tree/list mode
-    connect(ui->treeModeRadioButton, SIGNAL(toggled(bool)), this, SLOT(treeModeRadioButton(bool)));
-    connect(ui->listModeRadioButton, SIGNAL(toggled(bool)), this, SLOT(listModeRadioButton(bool)));
+    connect(ui->treeModeRadioButton, &QRadioButton::toggled, this, &ConsolidateUnspentWizardSelectInputsPage::treeModeRadioButton);
+    connect(ui->listModeRadioButton, &QRadioButton::toggled, this, &ConsolidateUnspentWizardSelectInputsPage::listModeRadioButton);
 
     // click on checkbox
-    connect(ui->treeWidget, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(viewItemChanged(QTreeWidgetItem*, int)));
+    connect(ui->treeWidget, &QTreeWidget::itemChanged, this, &ConsolidateUnspentWizardSelectInputsPage::viewItemChanged);
 
     // click on header
     ui->treeWidget->header()->setSectionsClickable(true);
-    connect(ui->treeWidget->header(), SIGNAL(sectionClicked(int)), this, SLOT(headerSectionClicked(int)));
+    connect(ui->treeWidget->header(), &QHeaderView::sectionClicked, this, &ConsolidateUnspentWizardSelectInputsPage::headerSectionClicked);
 
     // (un)select all
-    connect(ui->selectAllPushButton, SIGNAL(clicked()), this, SLOT(buttonSelectAllClicked()));
+    connect(ui->selectAllPushButton, &QPushButton::clicked, this, &ConsolidateUnspentWizardSelectInputsPage::buttonSelectAllClicked);
 
     // filter/consolidate button interaction
-    connect(ui->maxMinOutputValue, SIGNAL(textChanged()), this, SLOT(maxMinOutputValueChanged()));
+    connect(ui->maxMinOutputValue, &BitcoinAmountField::textChanged, this, &ConsolidateUnspentWizardSelectInputsPage::maxMinOutputValueChanged);
 
     // filter mode
-    connect(ui->filterModePushButton, SIGNAL(clicked()), this, SLOT(buttonFilterModeClicked()));
+    connect(ui->filterModePushButton, &QPushButton::clicked, this, &ConsolidateUnspentWizardSelectInputsPage::buttonFilterModeClicked);
 
     // filter
-    connect(ui->filterPushButton, SIGNAL(clicked()), this, SLOT(buttonFilterClicked()));
+    connect(ui->filterPushButton, &QPushButton::clicked, this, &ConsolidateUnspentWizardSelectInputsPage::buttonFilterClicked);
 
     ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 150);
     ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 170);

src/qt/diagnosticsdialog.cpp

@@ -406,16 +406,15 @@ void DiagnosticsDialog::VerifyClock(unsigned int connections)
     QTimer *timerVerifyClock = new QTimer();
 
     // Set up a timeout clock of 10 seconds as a fail-safe.
-    connect(timerVerifyClock, SIGNAL(timeout()), this, SLOT(clkFinished()));
+    connect(timerVerifyClock, &QTimer::timeout, this, &DiagnosticsDialog::clkFinished);
     timerVerifyClock->start(10 * 1000);
 
     QHostInfo NTPHost = QHostInfo::fromName("pool.ntp.org");
     m_udpSocket = new QUdpSocket(this);
 
-    connect(m_udpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this,
-            SLOT(clkStateChanged(QAbstractSocket::SocketState)));
-    connect(m_udpSocket, SIGNAL(error(QAbstractSocket::SocketError)), this,
-            SLOT(clkSocketError()));
+    connect(m_udpSocket, &QUdpSocket::stateChanged, this, &DiagnosticsDialog::clkStateChanged);
+    connect(m_udpSocket, static_cast<QAbstractSocket::SocketError (QUdpSocket::*)() const>(&QUdpSocket::error),
+            this, static_cast<void (DiagnosticsDialog::*)()>(&DiagnosticsDialog::clkSocketError));
 
     if (!NTPHost.addresses().empty())
     {
@@ -431,7 +430,7 @@ void DiagnosticsDialog::clkStateChanged(QAbstractSocket::SocketState state)
 {
     if (state == QAbstractSocket::ConnectedState)
     {
-        connect(m_udpSocket, SIGNAL(readyRead()), this, SLOT(clkFinished()));
+        connect(m_udpSocket, &QUdpSocket::readyRead, this, &DiagnosticsDialog::clkFinished);
 
         char NTPMessage[48] = {0x1b, 0, 0, 0 ,0, 0, 0, 0, 0};
 
@@ -539,8 +538,9 @@ void DiagnosticsDialog::VerifyTCPPort()
 
     m_tcpSocket = new QTcpSocket(this);
 
-    connect(m_tcpSocket, SIGNAL(connected()), this, SLOT(TCPFinished()));
-    connect(m_tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(TCPFailed(QAbstractSocket::SocketError)));
+    connect(m_tcpSocket, &QTcpSocket::connected, this, &DiagnosticsDialog::TCPFinished);
+    connect(m_tcpSocket, static_cast<void (QTcpSocket::*)(QAbstractSocket::SocketError)>(&QTcpSocket::error),
+            this, static_cast<void (DiagnosticsDialog::*)(QAbstractSocket::SocketError)>(&DiagnosticsDialog::TCPFailed));
 
     m_tcpSocket->connectToHost("portquiz.net", GetListenPort());
 }