From cfe4cad9e5ad040a1dbfc14098628fa30aa87498 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Fri, 21 Mar 2014 09:12:01 +0100 Subject: [PATCH] [Qt] fix style, formating, comment and indentation problems - introduced by #3920 --- src/qt/guiutil.cpp | 28 ++++++++++---------- src/qt/guiutil.h | 49 ++++++++++++++++++----------------- src/qt/receivecoinsdialog.cpp | 18 ++++++------- src/qt/receivecoinsdialog.h | 15 ++++++----- src/qt/transactionview.cpp | 10 ++++--- src/qt/transactionview.h | 13 +++++----- src/rpcwallet.cpp | 3 --- 7 files changed, 69 insertions(+), 67 deletions(-) diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 26c56c5be..7b264d27c 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -392,14 +392,15 @@ void TableViewLastColumnResizingFixer::connectViewHeadersSignals() connect(tableView->horizontalHeader(), SIGNAL(geometriesChanged()), this, SLOT(on_geometriesChanged())); } -//we need to disconnect these while handling the resize events, otherwise we can enter infinite loops +// We need to disconnect these while handling the resize events, otherwise we can enter infinite loops. void TableViewLastColumnResizingFixer::disconnectViewHeadersSignals() { disconnect(tableView->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(on_sectionResized(int,int,int))); disconnect(tableView->horizontalHeader(), SIGNAL(geometriesChanged()), this, SLOT(on_geometriesChanged())); } -//setup the resize mode, handles compatibility for QT5 and below as the method signatures changed. (refactored here for readability) +// Setup the resize mode, handles compatibility for Qt5 and below as the method signatures changed. +// Refactored here for readability. void TableViewLastColumnResizingFixer::setViewHeaderResizeMode(int logicalIndex, QHeaderView::ResizeMode resizeMode) { #if QT_VERSION < 0x050000 @@ -409,7 +410,8 @@ void TableViewLastColumnResizingFixer::setViewHeaderResizeMode(int logicalIndex, #endif } -void TableViewLastColumnResizingFixer::resizeColumn(int nColumnIndex, int width) { +void TableViewLastColumnResizingFixer::resizeColumn(int nColumnIndex, int width) +{ tableView->setColumnWidth(nColumnIndex, width); tableView->horizontalHeader()->resizeSection(nColumnIndex, width); } @@ -438,7 +440,7 @@ int TableViewLastColumnResizingFixer::getAvailableWidthForColumn(int column) return nResult; } -//make sure we don't make the columns wider than the table's viewport's width. +// Make sure we don't make the columns wider than the tables viewport width. void TableViewLastColumnResizingFixer::adjustTableColumnsWidth() { disconnectViewHeadersSignals(); @@ -453,14 +455,15 @@ void TableViewLastColumnResizingFixer::adjustTableColumnsWidth() } } -//make column use all the space available, useful during window resizing. -void TableViewLastColumnResizingFixer::stretchColumnWidth(int column) { +// Make column use all the space available, useful during window resizing. +void TableViewLastColumnResizingFixer::stretchColumnWidth(int column) +{ disconnectViewHeadersSignals(); resizeColumn(column, getAvailableWidthForColumn(column)); connectViewHeadersSignals(); } -//when a section is resized this is a slot-proxy for ajustAmountColumnWidth() +// When a section is resized this is a slot-proxy for ajustAmountColumnWidth(). void TableViewLastColumnResizingFixer::on_sectionResized(int logicalIndex, int oldSize, int newSize) { adjustTableColumnsWidth(); @@ -471,8 +474,8 @@ void TableViewLastColumnResizingFixer::on_sectionResized(int logicalIndex, int o } } -//when the table's geometry is ready, we manually perform the Stretch of the "Message" column -//as the "Stretch" resize mode does not allow for interactive resizing. +// When the tabless geometry is ready, we manually perform the stretch of the "Message" column, +// as the "Stretch" resize mode does not allow for interactive resizing. void TableViewLastColumnResizingFixer::on_geometriesChanged() { if ((getColumnsWidth() - this->tableView->horizontalHeader()->width()) != 0) @@ -488,9 +491,9 @@ void TableViewLastColumnResizingFixer::on_geometriesChanged() * the resize modes of the last 2 columns of the table and */ TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* table, int lastColMinimumWidth, int allColsMinimumWidth) : - tableView(table), - lastColumnMinimumWidth(lastColMinimumWidth), - allColumnsMinimumWidth(allColsMinimumWidth) + tableView(table), + lastColumnMinimumWidth(lastColMinimumWidth), + allColumnsMinimumWidth(allColsMinimumWidth) { columnCount = tableView->horizontalHeader()->count(); lastColumnIndex = columnCount - 1; @@ -500,7 +503,6 @@ TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* t setViewHeaderResizeMode(lastColumnIndex, QHeaderView::Interactive); } - #ifdef WIN32 boost::filesystem::path static StartupShortcutPath() { diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index d1d18bb5f..4f9416d1a 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -5,11 +5,11 @@ #ifndef GUIUTIL_H #define GUIUTIL_H +#include #include #include #include #include -#include #include @@ -132,30 +132,31 @@ namespace GUIUtil */ class TableViewLastColumnResizingFixer: public QObject { - Q_OBJECT - public: - TableViewLastColumnResizingFixer(QTableView* table, int lastColMinimumWidth, int allColsMinimumWidth); - void stretchColumnWidth(int column); + Q_OBJECT - private: - QTableView* tableView; - int lastColumnMinimumWidth; - int allColumnsMinimumWidth; - int lastColumnIndex; - int columnCount; - int secondToLastColumnIndex; - - void adjustTableColumnsWidth(); - int getAvailableWidthForColumn(int column); - int getColumnsWidth(); - void connectViewHeadersSignals(); - void disconnectViewHeadersSignals(); - void setViewHeaderResizeMode(int logicalIndex, QHeaderView::ResizeMode resizeMode); - void resizeColumn(int nColumnIndex, int width); - - private slots: - void on_sectionResized(int logicalIndex, int oldSize, int newSize); - void on_geometriesChanged(); + public: + TableViewLastColumnResizingFixer(QTableView* table, int lastColMinimumWidth, int allColsMinimumWidth); + void stretchColumnWidth(int column); + + private: + QTableView* tableView; + int lastColumnMinimumWidth; + int allColumnsMinimumWidth; + int lastColumnIndex; + int columnCount; + int secondToLastColumnIndex; + + void adjustTableColumnsWidth(); + int getAvailableWidthForColumn(int column); + int getColumnsWidth(); + void connectViewHeadersSignals(); + void disconnectViewHeadersSignals(); + void setViewHeaderResizeMode(int logicalIndex, QHeaderView::ResizeMode resizeMode); + void resizeColumn(int nColumnIndex, int width); + + private slots: + void on_sectionResized(int logicalIndex, int oldSize, int newSize); + void on_geometriesChanged(); }; bool GetStartOnSystemStartup(); diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index 007b13d64..3ccfb429a 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -55,8 +55,6 @@ ReceiveCoinsDialog::ReceiveCoinsDialog(QWidget *parent) : connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear())); } - - void ReceiveCoinsDialog::setModel(WalletModel *model) { this->model = model; @@ -79,11 +77,9 @@ void ReceiveCoinsDialog::setModel(WalletModel *model) tableView->setColumnWidth(RecentRequestsTableModel::Label, LABEL_COLUMN_WIDTH); connect(tableView->selectionModel(), - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, + SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(on_recentRequestsView_selectionChanged(QItemSelection, QItemSelection))); - - //(last 2 columns are set when the table geometry is ready) by the columnResizingFixer. + // 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); } } @@ -202,10 +198,12 @@ void ReceiveCoinsDialog::on_removeRequestButton_clicked() model->getRecentRequestsTableModel()->removeRows(firstIndex.row(), selection.length(), firstIndex.parent()); } -//We override the virtual resizeEvent of the QWidget to adjust tablet's column sizes as the table's width is proportional to the dialog's. -void ReceiveCoinsDialog::resizeEvent(QResizeEvent* event) { - QWidget::resizeEvent(event); - columnResizingFixer->stretchColumnWidth(RecentRequestsTableModel::Message); +// 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) +{ + QWidget::resizeEvent(event); + columnResizingFixer->stretchColumnWidth(RecentRequestsTableModel::Message); } void ReceiveCoinsDialog::keyPressEvent(QKeyEvent *event) diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h index 1d051d932..ab6333159 100644 --- a/src/qt/receivecoinsdialog.h +++ b/src/qt/receivecoinsdialog.h @@ -6,12 +6,13 @@ #define RECEIVECOINSDIALOG_H #include +#include +#include #include #include #include #include -#include -#include + #include "guiutil.h" namespace Ui { @@ -31,16 +32,16 @@ class ReceiveCoinsDialog : public QDialog public: enum ColumnWidths { - DATE_COLUMN_WIDTH = 130, - LABEL_COLUMN_WIDTH = 120, - AMOUNT_MINIMUM_COLUMN_WIDTH = 160, - MINIMUM_COLUMN_WIDTH = 130 + DATE_COLUMN_WIDTH = 130, + LABEL_COLUMN_WIDTH = 120, + AMOUNT_MINIMUM_COLUMN_WIDTH = 160, + MINIMUM_COLUMN_WIDTH = 130 }; explicit ReceiveCoinsDialog(QWidget *parent = 0); ~ReceiveCoinsDialog(); - void setModel(WalletModel *model); + void setModel(WalletModel *model); public slots: void clear(); diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index d178efe8d..a36315091 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -438,8 +438,10 @@ void TransactionView::focusTransaction(const QModelIndex &idx) transactionView->setFocus(); } -//We override the virtual resizeEvent of the QWidget to adjust tablet's column sizes as the table's width is proportional to the dialog's. -void TransactionView::resizeEvent(QResizeEvent* event) { - QWidget::resizeEvent(event); - columnResizingFixer->stretchColumnWidth(TransactionTableModel::ToAddress); +// We override the virtual resizeEvent of the QWidget to adjust tables column +// sizes as the tables width is proportional to the dialogs width. +void TransactionView::resizeEvent(QResizeEvent* event) +{ + QWidget::resizeEvent(event); + columnResizingFixer->stretchColumnWidth(TransactionTableModel::ToAddress); } diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h index fe8e205d6..ef4f9d6f3 100644 --- a/src/qt/transactionview.h +++ b/src/qt/transactionview.h @@ -5,9 +5,10 @@ #ifndef TRANSACTIONVIEW_H #define TRANSACTIONVIEW_H -#include #include "guiutil.h" +#include + class TransactionFilterProxy; class WalletModel; @@ -46,11 +47,11 @@ public: }; enum ColumnWidths { - STATUS_COLUMN_WIDTH = 23, - DATE_COLUMN_WIDTH = 120, - TYPE_COLUMN_WIDTH = 120, - AMOUNT_MINIMUM_COLUMN_WIDTH = 120, - MINIMUM_COLUMN_WIDTH = 23 + STATUS_COLUMN_WIDTH = 23, + DATE_COLUMN_WIDTH = 120, + TYPE_COLUMN_WIDTH = 120, + AMOUNT_MINIMUM_COLUMN_WIDTH = 120, + MINIMUM_COLUMN_WIDTH = 23 }; private: diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index c8b212726..a5a7df086 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1918,6 +1918,3 @@ Value getwalletinfo(const Array& params, bool fHelp) obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); return obj; } - - -