Browse Source

Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreach.hpp> removal

0.15
Jorge Timón 8 years ago
parent
commit
a5410ac5ec
No known key found for this signature in database
GPG Key ID: 8866C18EA1C944A2
  1. 2
      src/httprpc.cpp
  2. 3
      src/qt/platformstyle.cpp
  3. 2
      src/utilstrencodings.h

2
src/httprpc.cpp

@ -19,7 +19,7 @@
#include "utilstrencodings.h" #include "utilstrencodings.h"
#include <boost/algorithm/string.hpp> // boost::trim #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 */ /** WWW-Authenticate to present with 401 Unauthorized response */
static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\""; static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";

3
src/qt/platformstyle.cpp

@ -48,8 +48,7 @@ void MakeSingleColorImage(QImage& img, const QColor& colorbase)
QIcon ColorizeIcon(const QIcon& ico, const QColor& colorbase) QIcon ColorizeIcon(const QIcon& ico, const QColor& colorbase)
{ {
QIcon new_ico; QIcon new_ico;
QSize sz; Q_FOREACH(const QSize sz, ico.availableSizes())
Q_FOREACH(sz, ico.availableSizes())
{ {
QImage img(ico.pixmap(sz).toImage()); QImage img(ico.pixmap(sz).toImage());
MakeSingleColorImage(img, colorbase); MakeSingleColorImage(img, colorbase);

2
src/utilstrencodings.h

@ -18,8 +18,6 @@
#define UBEGIN(a) ((unsigned char*)&(a)) #define UBEGIN(a) ((unsigned char*)&(a))
#define UEND(a) ((unsigned char*)&((&(a))[1])) #define UEND(a) ((unsigned char*)&((&(a))[1]))
#define ARRAYLEN(array) (sizeof(array)/sizeof((array)[0])) #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> #define PAIRTYPE(t1, t2) std::pair<t1, t2>
/** Used by SanitizeString() */ /** Used by SanitizeString() */

Loading…
Cancel
Save