diff options
| author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2014-12-05 09:40:58 +0100 |
|---|---|---|
| committer | Philip Kaufmann <phil.kaufmann@t-online.de> | 2014-12-08 16:09:02 +0100 |
| commit | 5ec654b8ceb4c5f9aafda2b62a0aa6639d738654 (patch) | |
| tree | 8c94b0ab83539e548787dd9016def51de921f4d7 /src | |
| parent | 4333e26c8e89e3d02cfb4d3464108b1a15175e2b (diff) | |
| download | bitcoin-5ec654b8ceb4c5f9aafda2b62a0aa6639d738654.tar.xz | |
[Qt] update paymentserver license and cleanup ordering
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/paymentrequestplus.cpp | 4 | ||||
| -rw-r--r-- | src/qt/paymentrequestplus.h | 4 | ||||
| -rw-r--r-- | src/qt/paymentserver.cpp | 6 | ||||
| -rw-r--r-- | src/qt/paymentserver.h | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index 7aefffe24a..a40b5bbcd8 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -1,5 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying +// Copyright (c) 2011-2014 The Bitcoin developers +// Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h index 91c704c520..fbc3a09265 100644 --- a/src/qt/paymentrequestplus.h +++ b/src/qt/paymentrequestplus.h @@ -1,5 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying +// Copyright (c) 2011-2014 The Bitcoin developers +// Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_QT_PAYMENTREQUESTPLUS_H diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index d6e396b211..bd3dab41a8 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -1,5 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying +// Copyright (c) 2011-2014 The Bitcoin developers +// Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "paymentserver.h" @@ -46,8 +46,8 @@ #include <QUrlQuery> #endif -using namespace std; using namespace boost; +using namespace std; const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds const QString BITCOIN_IPC_PREFIX("bitcoin:"); diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index 42940664ec..e1305b9437 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying +// Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_QT_PAYMENTSERVER_H @@ -40,6 +40,8 @@ class OptionsModel; +class CWallet; + QT_BEGIN_NAMESPACE class QApplication; class QByteArray; @@ -50,8 +52,6 @@ class QSslError; class QUrl; QT_END_NAMESPACE -class CWallet; - // BIP70 max payment request size in bytes (DoS protection) extern const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE; |