Skip to content

Commit a5824bb

Browse files
committed
Merge pull request #3433
6c1bf19 [Qt] style-police, add missing license headers (Philip Kaufmann)
2 parents 57fdd68 + 6c1bf19 commit a5824bb

8 files changed

+21
-10
lines changed

src/qt/bitcoinamountfield.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
#include <QKeyEvent>
1515
#include <qmath.h> // for qPow()
1616

17-
BitcoinAmountField::BitcoinAmountField(QWidget *parent):
18-
QWidget(parent), amount(0), currentUnit(-1)
17+
BitcoinAmountField::BitcoinAmountField(QWidget *parent) :
18+
QWidget(parent),
19+
amount(0),
20+
currentUnit(-1)
1921
{
2022
amount = new QDoubleSpinBox(this);
2123
amount->setLocale(QLocale::c());

src/qt/editaddressdialog.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313

1414
EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
1515
QDialog(parent),
16-
ui(new Ui::EditAddressDialog), mapper(0), mode(mode), model(0)
16+
ui(new Ui::EditAddressDialog),
17+
mapper(0),
18+
mode(mode),
19+
model(0)
1720
{
1821
ui->setupUi(this);
1922

src/qt/macdockiconhandler.mm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
// Copyright (c) 2011-2013 The Bitcoin Core developers
2+
// Distributed under the MIT/X11 software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
15
#include "macdockiconhandler.h"
26

7+
#include <QImageWriter>
38
#include <QMenu>
4-
#include <QWidget>
59
#include <QTemporaryFile>
6-
#include <QImageWriter>
10+
#include <QWidget>
711

812
#undef slots
913
#include <Cocoa/Cocoa.h>

src/qt/macnotificationhandler.mm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Copyright (c) 2011-2013 The Bitcoin Core developers
2+
// Distributed under the MIT/X11 software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
15
#include "macnotificationhandler.h"
26

37
#undef slots

src/qt/receivecoinsdialog.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ namespace Ui {
1313
}
1414
class WalletModel;
1515
class OptionsModel;
16+
1617
QT_BEGIN_NAMESPACE
1718
class QModelIndex;
1819
QT_END_NAMESPACE

src/qt/walletmodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#include "addresstablemodel.h"
88
#include "guiconstants.h"
9-
#include "transactiontablemodel.h"
109
#include "recentrequeststablemodel.h"
10+
#include "transactiontablemodel.h"
1111

1212
#include "base58.h"
1313
#include "db.h"

src/qt/walletmodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
class AddressTableModel;
1919
class OptionsModel;
20-
class TransactionTableModel;
2120
class RecentRequestsTableModel;
21+
class TransactionTableModel;
2222
class WalletModelTransaction;
2323

2424
class CCoinControl;

src/qt/walletmodeltransaction.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ class WalletModelTransaction
3939
CWalletTx *walletTransaction;
4040
CReserveKey *keyChange;
4141
qint64 fee;
42-
43-
public slots:
44-
4542
};
4643

4744
#endif // WALLETMODELTRANSACTION_H

0 commit comments

Comments
 (0)