Browse Source

Merge pull request #3433

6c1bf19 [Qt] style-police, add missing license headers (Philip Kaufmann)
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
a5824bb3c6
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 4
      src/qt/bitcoinamountfield.cpp
  2. 5
      src/qt/editaddressdialog.cpp
  3. 8
      src/qt/macdockiconhandler.mm
  4. 4
      src/qt/macnotificationhandler.mm
  5. 1
      src/qt/receivecoinsdialog.h
  6. 2
      src/qt/walletmodel.cpp
  7. 2
      src/qt/walletmodel.h
  8. 3
      src/qt/walletmodeltransaction.h

4
src/qt/bitcoinamountfield.cpp

@ -15,7 +15,9 @@
#include <qmath.h> // for qPow() #include <qmath.h> // for qPow()
BitcoinAmountField::BitcoinAmountField(QWidget *parent) : BitcoinAmountField::BitcoinAmountField(QWidget *parent) :
QWidget(parent), amount(0), currentUnit(-1) QWidget(parent),
amount(0),
currentUnit(-1)
{ {
amount = new QDoubleSpinBox(this); amount = new QDoubleSpinBox(this);
amount->setLocale(QLocale::c()); amount->setLocale(QLocale::c());

5
src/qt/editaddressdialog.cpp

@ -13,7 +13,10 @@
EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) : EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
QDialog(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); ui->setupUi(this);

8
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 "macdockiconhandler.h"
#include <QImageWriter>
#include <QMenu> #include <QMenu>
#include <QWidget>
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QImageWriter> #include <QWidget>
#undef slots #undef slots
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>

4
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" #include "macnotificationhandler.h"
#undef slots #undef slots

1
src/qt/receivecoinsdialog.h

@ -13,6 +13,7 @@ namespace Ui {
} }
class WalletModel; class WalletModel;
class OptionsModel; class OptionsModel;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QModelIndex; class QModelIndex;
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/qt/walletmodel.cpp

@ -6,8 +6,8 @@
#include "addresstablemodel.h" #include "addresstablemodel.h"
#include "guiconstants.h" #include "guiconstants.h"
#include "transactiontablemodel.h"
#include "recentrequeststablemodel.h" #include "recentrequeststablemodel.h"
#include "transactiontablemodel.h"
#include "base58.h" #include "base58.h"
#include "db.h" #include "db.h"

2
src/qt/walletmodel.h

@ -17,8 +17,8 @@
class AddressTableModel; class AddressTableModel;
class OptionsModel; class OptionsModel;
class TransactionTableModel;
class RecentRequestsTableModel; class RecentRequestsTableModel;
class TransactionTableModel;
class WalletModelTransaction; class WalletModelTransaction;
class CCoinControl; class CCoinControl;

3
src/qt/walletmodeltransaction.h

@ -39,9 +39,6 @@ private:
CWalletTx *walletTransaction; CWalletTx *walletTransaction;
CReserveKey *keyChange; CReserveKey *keyChange;
qint64 fee; qint64 fee;
public slots:
}; };
#endif // WALLETMODELTRANSACTION_H #endif // WALLETMODELTRANSACTION_H

Loading…
Cancel
Save