diff options
| author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-07-23 08:52:24 +0200 |
|---|---|---|
| committer | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-07-23 08:52:24 +0200 |
| commit | 84ef729aa1de762229c8a5c800cddff1a014fcca (patch) | |
| tree | ba4aeda20db80a0f3b476516b70d7cc4337129cb /src/qt/paymentserver.cpp | |
| parent | 0a740650a52a21b7d82b43524017c87643af3224 (diff) | |
| download | bitcoin-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/paymentserver.cpp')
| -rw-r--r-- | src/qt/paymentserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 0b0bce55bb..8178065bcc 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 <QApplication> - #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 <QApplication> #include <QByteArray> #include <QDataStream> #include <QDebug> |