diff options
| author | Jorge Timón <jtimon@jtimon.cc> | 2017-06-01 22:22:33 +0200 |
|---|---|---|
| committer | Jorge Timón <jtimon@jtimon.cc> | 2017-06-05 20:02:30 +0200 |
| commit | a5410ac5ece4ef4d52eab07201c5f6c6c4501921 (patch) | |
| tree | 996900e1990d9c06ef3312c90713bdd30b481faa | |
| parent | 9fec4da0bec93a49798b5f5e92cf76e900759ee4 (diff) | |
Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreach.hpp> removal
| -rw-r--r-- | src/httprpc.cpp | 2 | ||||
| -rw-r--r-- | src/qt/platformstyle.cpp | 3 | ||||
| -rw-r--r-- | src/utilstrencodings.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/httprpc.cpp b/src/httprpc.cpp index 5ab6d8d732..f1eb1c36e7 100644 --- a/src/httprpc.cpp +++ b/src/httprpc.cpp @@ -19,7 +19,7 @@ #include "utilstrencodings.h" #include <boost/algorithm/string.hpp> // boost::trim -#include <boost/foreach.hpp> //BOOST_FOREACH +#include <boost/foreach.hpp> /** WWW-Authenticate to present with 401 Unauthorized response */ static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\""; diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp index 90bd619c04..64a0d0058c 100644 --- a/src/qt/platformstyle.cpp +++ b/src/qt/platformstyle.cpp @@ -48,8 +48,7 @@ void MakeSingleColorImage(QImage& img, const QColor& colorbase) QIcon ColorizeIcon(const QIcon& ico, const QColor& colorbase) { QIcon new_ico; - QSize sz; - Q_FOREACH(sz, ico.availableSizes()) + Q_FOREACH(const QSize sz, ico.availableSizes()) { QImage img(ico.pixmap(sz).toImage()); MakeSingleColorImage(img, colorbase); diff --git a/src/utilstrencodings.h b/src/utilstrencodings.h index e2a1b9bef9..8846cb47ee 100644 --- a/src/utilstrencodings.h +++ b/src/utilstrencodings.h @@ -18,8 +18,6 @@ #define UBEGIN(a) ((unsigned char*)&(a)) #define UEND(a) ((unsigned char*)&((&(a))[1])) #define ARRAYLEN(array) (sizeof(array)/sizeof((array)[0])) - -/** This is needed because the foreach macro can't get over the comma in pair<t1, t2> */ #define PAIRTYPE(t1, t2) std::pair<t1, t2> /** Used by SanitizeString() */ |