From 84ef729aa1de762229c8a5c800cddff1a014fcca Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Tue, 23 Jul 2013 08:52:24 +0200 Subject: [PATCH] Bitcoin-Qt: fix QApplication includes to match our include defaults - move all QApplication includes to top of included Qt headers - undef our loop macro where it would cause compilation errors otherwise --- src/qt/bitcoin.cpp | 4 ++-- src/qt/bitcoinamountfield.cpp | 3 ++- src/qt/bitcoingui.cpp | 4 ++-- src/qt/guiutil.cpp | 4 ++-- src/qt/notificator.cpp | 2 +- src/qt/paymentserver.cpp | 4 ++-- src/qt/splashscreen.cpp | 4 ++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index b0c45d686..4e9180b88 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -2,8 +2,6 @@ * W.J. van der Laan 2011-2012 */ -#include - #include "bitcoingui.h" #include "clientmodel.h" #include "walletmodel.h" @@ -17,6 +15,8 @@ #include "splashscreen.h" #include "intro.h" +#undef loop /* Todo: ugh, remove this when the #define loop is gone from util.h */ +#include #include #if QT_VERSION < 0x050000 #include diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index b502505f3..eeb6fe89b 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -4,10 +4,11 @@ #include "bitcoinunits.h" #include "guiconstants.h" +#include #include #include #include -#include + #include // for qPow() BitcoinAmountField::BitcoinAmountField(QWidget *parent): diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 190da6caf..11767cf31 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -5,8 +5,6 @@ * The Bitcoin Developers 2011-2012 */ -#include - #include "bitcoingui.h" #include "transactiontablemodel.h" @@ -30,6 +28,8 @@ #include "macdockiconhandler.h" #endif +#undef loop /* Todo: ugh, remove this when the #define loop is gone from util.h */ +#include #include #include #include diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 3d1e91efd..521d9bddd 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -1,5 +1,3 @@ -#include - #include "guiutil.h" #include "bitcoinaddressvalidator.h" @@ -9,6 +7,8 @@ #include "util.h" #include "init.h" +#undef loop /* Todo: ugh, remove this when the #define loop is gone from util.h */ +#include #include #include #include diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 7cfaef607..903c54b39 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -1,9 +1,9 @@ #include "notificator.h" +#include #include #include #include -#include #include #include #include diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 0b0bce55b..8178065bc 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -2,14 +2,14 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include - #include "paymentserver.h" #include "guiconstants.h" #include "ui_interface.h" #include "util.h" +#undef loop /* Todo: ugh, remove this when the #define loop is gone from util.h */ +#include #include #include #include diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index e40027812..43430a858 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -2,9 +2,9 @@ #include "clientversion.h" #include "util.h" -#include -#undef loop /* ugh, remove this when the #define loop is gone from util.h */ +#undef loop /* Todo: ugh, remove this when the #define loop is gone from util.h */ #include +#include SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : QSplashScreen(pixmap, f)