aboutsummaryrefslogtreecommitdiff
path: root/src/qt/bitcoin.cpp
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-07-23 08:52:24 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-07-23 08:52:24 +0200
commit84ef729aa1de762229c8a5c800cddff1a014fcca (patch)
treeba4aeda20db80a0f3b476516b70d7cc4337129cb /src/qt/bitcoin.cpp
parent0a740650a52a21b7d82b43524017c87643af3224 (diff)
downloadbitcoin-84ef729aa1de762229c8a5c800cddff1a014fcca.tar.xz
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
Diffstat (limited to 'src/qt/bitcoin.cpp')
-rw-r--r--src/qt/bitcoin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index b0c45d6863..4e9180b88c 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -2,8 +2,6 @@
* W.J. van der Laan 2011-2012
*/
-#include <QApplication>
-
#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 <QApplication>
#include <QMessageBox>
#if QT_VERSION < 0x050000
#include <QTextCodec>