From 4bee715bfd986a31cd98700bcb945dfa5d03cd7c Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Wed, 22 Jan 2014 09:46:15 +0100 Subject: [PATCH] [Qt] very minor style cleanups - rebuilt some ui file layout to remove unreal values from the files - remove an unneeded attribute from an ui file - add / remove some spaces in files --- src/qt/forms/askpassphrasedialog.ui | 16 ++++++++-------- src/qt/forms/editaddressdialog.ui | 16 ++++++++-------- src/qt/forms/intro.ui | 16 ++++++++-------- src/qt/forms/signverifymessagedialog.ui | 3 --- src/qt/forms/transactiondescdialog.ui | 16 ++++++++-------- src/qt/recentrequeststablemodel.h | 4 ++-- src/qt/splashscreen.cpp | 2 +- src/qt/walletmodel.h | 2 +- 8 files changed, 36 insertions(+), 39 deletions(-) diff --git a/src/qt/forms/askpassphrasedialog.ui b/src/qt/forms/askpassphrasedialog.ui index 25169042a..bc4921455 100644 --- a/src/qt/forms/askpassphrasedialog.ui +++ b/src/qt/forms/askpassphrasedialog.ui @@ -122,12 +122,12 @@ accept() - 248 - 254 + 20 + 20 - 157 - 274 + 20 + 20 @@ -138,12 +138,12 @@ reject() - 316 - 260 + 20 + 20 - 286 - 274 + 20 + 20 diff --git a/src/qt/forms/editaddressdialog.ui b/src/qt/forms/editaddressdialog.ui index 8ff380522..915b3679a 100644 --- a/src/qt/forms/editaddressdialog.ui +++ b/src/qt/forms/editaddressdialog.ui @@ -76,12 +76,12 @@ accept() - 248 - 254 + 20 + 20 - 157 - 274 + 20 + 20 @@ -92,12 +92,12 @@ reject() - 316 - 260 + 20 + 20 - 286 - 274 + 20 + 20 diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui index 05ee9466c..09e7bdb02 100644 --- a/src/qt/forms/intro.ui +++ b/src/qt/forms/intro.ui @@ -237,12 +237,12 @@ accept() - 248 - 254 + 20 + 20 - 157 - 274 + 20 + 20 @@ -253,12 +253,12 @@ reject() - 316 - 260 + 20 + 20 - 286 - 274 + 20 + 20 diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui index 04d614a1c..989522bb5 100644 --- a/src/qt/forms/signverifymessagedialog.ui +++ b/src/qt/forms/signverifymessagedialog.ui @@ -19,9 +19,6 @@ - - 0 - &Sign Message diff --git a/src/qt/forms/transactiondescdialog.ui b/src/qt/forms/transactiondescdialog.ui index b38dffcc1..5ae1e1285 100644 --- a/src/qt/forms/transactiondescdialog.ui +++ b/src/qt/forms/transactiondescdialog.ui @@ -45,12 +45,12 @@ accept() - 248 - 254 + 20 + 20 - 157 - 274 + 20 + 20 @@ -61,12 +61,12 @@ reject() - 316 - 260 + 20 + 20 - 286 - 274 + 20 + 20 diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h index 6b20402f7..51aef9dec 100644 --- a/src/qt/recentrequeststablemodel.h +++ b/src/qt/recentrequeststablemodel.h @@ -18,7 +18,7 @@ class RecentRequestEntry public: RecentRequestEntry() : nVersion(RecentRequestEntry::CURRENT_VERSION), id(0) { } - static const int CURRENT_VERSION=1; + static const int CURRENT_VERSION = 1; int nVersion; int64_t id; QDateTime date; @@ -46,7 +46,7 @@ class RecentRequestEntryLessThan public: RecentRequestEntryLessThan(int nColumn, Qt::SortOrder fOrder): column(nColumn), order(fOrder) {} - bool operator()(RecentRequestEntry &left, RecentRequestEntry &right ) const; + bool operator()(RecentRequestEntry &left, RecentRequestEntry &right) const; private: int column; diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 8b16496c1..c21679ea8 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -5,8 +5,8 @@ #include "splashscreen.h" #include "clientversion.h" -#include "util.h" #include "ui_interface.h" +#include "util.h" #include #include diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 600bef346..6d9d866b2 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -56,7 +56,7 @@ public: // Empty if no authentication or invalid signature/cert/etc. QString authenticatedMerchant; - static const int CURRENT_VERSION=1; + static const int CURRENT_VERSION = 1; int nVersion; IMPLEMENT_SERIALIZE