aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2014-05-06 12:52:21 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2014-05-06 12:52:21 +0200
commit01ce7117988dc4a894b3cb2e182e3f20c1f7b6e0 (patch)
tree71a468c18db17513f1e49a7f99d9f28b21ca04c5
parentd4ffe4e425b5a3f6fe4ff0ce7297608dfe6c7417 (diff)
downloadbitcoin-01ce7117988dc4a894b3cb2e182e3f20c1f7b6e0.tar.xz
[Qt] fix Qt slot problem in receivecoinsdialog
- fixes error from debug.log: QMetaObject::connectSlotsByName: No matching signal for on_recentRequestsView_selectionChanged(QItemSelection,QItemSelection) - small style fixes (e.g. alphabetical ordering if includes etc.) - fixes #3992
-rw-r--r--src/qt/receivecoinsdialog.cpp19
-rw-r--r--src/qt/receivecoinsdialog.h8
2 files changed, 13 insertions, 14 deletions
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index 3ccfb429a6..f2c76c8355 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -5,21 +5,21 @@
#include "receivecoinsdialog.h"
#include "ui_receivecoinsdialog.h"
-#include "walletmodel.h"
-#include "bitcoinunits.h"
#include "addressbookpage.h"
-#include "optionsmodel.h"
+#include "addresstablemodel.h"
+#include "bitcoinunits.h"
#include "guiutil.h"
+#include "optionsmodel.h"
#include "receiverequestdialog.h"
-#include "addresstablemodel.h"
#include "recentrequeststablemodel.h"
+#include "walletmodel.h"
#include <QAction>
#include <QCursor>
+#include <QItemSelection>
#include <QMessageBox>
-#include <QTextDocument>
#include <QScrollBar>
-#include <QItemSelection>
+#include <QTextDocument>
ReceiveCoinsDialog::ReceiveCoinsDialog(QWidget *parent) :
QDialog(parent),
@@ -78,7 +78,7 @@ void ReceiveCoinsDialog::setModel(WalletModel *model)
connect(tableView->selectionModel(),
SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this,
- SLOT(on_recentRequestsView_selectionChanged(QItemSelection, QItemSelection)));
+ SLOT(recentRequestsView_selectionChanged(QItemSelection, QItemSelection)));
// Last 2 columns are set by the columnResizingFixer, when the table geometry is ready.
columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH);
}
@@ -165,8 +165,7 @@ void ReceiveCoinsDialog::on_recentRequestsView_doubleClicked(const QModelIndex &
dialog->show();
}
-void ReceiveCoinsDialog::on_recentRequestsView_selectionChanged(const QItemSelection &selected,
- const QItemSelection &deselected)
+void ReceiveCoinsDialog::recentRequestsView_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
{
// Enable Show/Remove buttons only if anything is selected.
bool enable = !ui->recentRequestsView->selectionModel()->selectedRows().isEmpty();
@@ -200,7 +199,7 @@ void ReceiveCoinsDialog::on_removeRequestButton_clicked()
// We override the virtual resizeEvent of the QWidget to adjust tables column
// sizes as the tables width is proportional to the dialogs width.
-void ReceiveCoinsDialog::resizeEvent(QResizeEvent* event)
+void ReceiveCoinsDialog::resizeEvent(QResizeEvent *event)
{
QWidget::resizeEvent(event);
columnResizingFixer->stretchColumnWidth(RecentRequestsTableModel::Message);
diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h
index ab63331597..663cb157a4 100644
--- a/src/qt/receivecoinsdialog.h
+++ b/src/qt/receivecoinsdialog.h
@@ -18,8 +18,8 @@
namespace Ui {
class ReceiveCoinsDialog;
}
-class WalletModel;
class OptionsModel;
+class WalletModel;
QT_BEGIN_NAMESPACE
class QModelIndex;
@@ -57,16 +57,16 @@ private:
WalletModel *model;
QMenu *contextMenu;
void copyColumnToClipboard(int column);
- virtual void resizeEvent(QResizeEvent* event);
+ virtual void resizeEvent(QResizeEvent *event);
private slots:
void on_receiveButton_clicked();
void on_showRequestButton_clicked();
void on_removeRequestButton_clicked();
void on_recentRequestsView_doubleClicked(const QModelIndex &index);
- void on_recentRequestsView_selectionChanged(const QItemSelection &, const QItemSelection &);
+ void recentRequestsView_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
void updateDisplayUnit();
- void showMenu(const QPoint &);
+ void showMenu(const QPoint &point);
void copyLabel();
void copyMessage();
void copyAmount();