diff options
| author | Brandon Dahler <brandon.dahler@gmail.com> | 2013-04-13 00:13:08 -0500 |
|---|---|---|
| committer | Brandon Dahler <brandon.dahler@gmail.com> | 2013-11-10 09:36:28 -0600 |
| commit | 51ed9ec971614aebdbfbd9527aba365dd0afd437 (patch) | |
| tree | d2f910390e55aef857023812fbdaefdd66cd99ff /src/qt/paymentserver.cpp | |
| parent | 7c4c207be8420d394a5abc4368d1bb69ad4f8067 (diff) | |
Cleanup code using forward declarations.
Use misc methods of avoiding unnecesary header includes.
Replace int typedefs with int##_t from stdint.h.
Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h.
Normalize QT_VERSION ifs where possible.
Resolve some indirect dependencies as direct ones.
Remove extern declarations from .cpp files.
Diffstat (limited to 'src/qt/paymentserver.cpp')
| -rw-r--r-- | src/qt/paymentserver.cpp | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 87db4bbf34..cb6291c35d 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -2,6 +2,23 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "paymentserver.h" + +#include "bitcoinunits.h" +#include "guiconstants.h" +#include "guiutil.h" +#include "optionsmodel.h" +#include "paymentserver.h" +#include "walletmodel.h" + +#include "base58.h" +#include "ui_interface.h" +#include "wallet.h" + +#include <cstdlib> + +#include <openssl/x509.h> +#include <openssl/x509_vfy.h> #include <QApplication> #include <QByteArray> #include <QDataStream> @@ -13,8 +30,6 @@ #include <QList> #include <QLocalServer> #include <QLocalSocket> -#include <QStringList> -#include <QTextDocument> #include <QNetworkAccessManager> #include <QNetworkProxy> #include <QNetworkReply> @@ -22,27 +37,16 @@ #include <QSslCertificate> #include <QSslError> #include <QSslSocket> +#include <QStringList> +#include <QTextDocument> + #if QT_VERSION < 0x050000 #include <QUrl> #else #include <QUrlQuery> #endif -#include <cstdlib> - -#include <openssl/x509.h> -#include <openssl/x509_vfy.h> - -#include "base58.h" -#include "bitcoinunits.h" -#include "guiconstants.h" -#include "guiutil.h" -#include "optionsmodel.h" -#include "paymentserver.h" -#include "ui_interface.h" -#include "util.h" -#include "wallet.h" -#include "walletmodel.h" +using namespace boost; const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds const QString BITCOIN_IPC_PREFIX("bitcoin:"); @@ -357,10 +361,10 @@ void PaymentServer::handleURIOrFile(const QString& s) if (s.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // bitcoin: { -#if QT_VERSION >= 0x050000 - QUrlQuery uri((QUrl(s))); -#else +#if QT_VERSION < 0x050000 QUrl uri(s); +#else + QUrlQuery uri((QUrl(s))); #endif if (uri.hasQueryItem("request")) { |