Merge pull request #3433

6c1bf19 [Qt] style-police, add missing license headers (Philip Kaufmann)

8 files changed, 21 insertions, 10 deletions

diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
index 6b083331d3..1698595188 100644
--- a/src/qt/bitcoinamountfield.cpp
+++ b/src/qt/bitcoinamountfield.cpp
@@ -14,8 +14,10 @@
 #include <QKeyEvent>
 #include <qmath.h> // for qPow()
 
-BitcoinAmountField::BitcoinAmountField(QWidget *parent):
-        QWidget(parent), amount(0), currentUnit(-1)
+BitcoinAmountField::BitcoinAmountField(QWidget *parent) :
+    QWidget(parent),
+    amount(0),
+    currentUnit(-1)
 {
     amount = new QDoubleSpinBox(this);
     amount->setLocale(QLocale::c());
diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp
index 618567218f..46982cc339 100644
--- a/src/qt/editaddressdialog.cpp
+++ b/src/qt/editaddressdialog.cpp
@@ -13,7 +13,10 @@
 
 EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::EditAddressDialog), mapper(0), mode(mode), model(0)
+    ui(new Ui::EditAddressDialog),
+    mapper(0),
+    mode(mode),
+    model(0)
 {
     ui->setupUi(this);
 
diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm
index 86b8c834d4..64291c9188 100644
--- a/src/qt/macdockiconhandler.mm
+++ b/src/qt/macdockiconhandler.mm
@@ -1,9 +1,13 @@
+// Copyright (c) 2011-2013 The Bitcoin Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "macdockiconhandler.h"
 
+#include <QImageWriter>
 #include <QMenu>
-#include <QWidget>
 #include <QTemporaryFile>
-#include <QImageWriter>
+#include <QWidget>
 
 #undef slots
 #include <Cocoa/Cocoa.h>
diff --git a/src/qt/macnotificationhandler.mm b/src/qt/macnotificationhandler.mm
index 8bb9b887a1..8a4c94cc5c 100644
--- a/src/qt/macnotificationhandler.mm
+++ b/src/qt/macnotificationhandler.mm
@@ -1,3 +1,7 @@
+// Copyright (c) 2011-2013 The Bitcoin Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "macnotificationhandler.h"
 
 #undef slots
diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h
index 4435bf6694..ed4b04d361 100644
--- a/src/qt/receivecoinsdialog.h
+++ b/src/qt/receivecoinsdialog.h
@@ -13,6 +13,7 @@ namespace Ui {
 }
 class WalletModel;
 class OptionsModel;
+
 QT_BEGIN_NAMESPACE
 class QModelIndex;
 QT_END_NAMESPACE
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 984a5a2e71..f08342b83e 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -6,8 +6,8 @@
 
 #include "addresstablemodel.h"
 #include "guiconstants.h"
-#include "transactiontablemodel.h"
 #include "recentrequeststablemodel.h"
+#include "transactiontablemodel.h"
 
 #include "base58.h"
 #include "db.h"
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 642021df1a..1a4d25615a 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -17,8 +17,8 @@
 
 class AddressTableModel;
 class OptionsModel;
-class TransactionTableModel;
 class RecentRequestsTableModel;
+class TransactionTableModel;
 class WalletModelTransaction;
 
 class CCoinControl;
diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h
index a948808a75..b7e85bcd11 100644
--- a/src/qt/walletmodeltransaction.h
+++ b/src/qt/walletmodeltransaction.h
@@ -39,9 +39,6 @@ private:
     CWalletTx *walletTransaction;
     CReserveKey *keyChange;
     qint64 fee;
-
-public slots:
-
 };
 
 #endif // WALLETMODELTRANSACTION_H