Skip to content

Commit a5410ac

Browse files
committed
Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreach.hpp> removal
1 parent 9fec4da commit a5410ac

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

src/httprpc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "utilstrencodings.h"
2020

2121
#include <boost/algorithm/string.hpp> // boost::trim
22-
#include <boost/foreach.hpp> //BOOST_FOREACH
22+
#include <boost/foreach.hpp>
2323

2424
/** WWW-Authenticate to present with 401 Unauthorized response */
2525
static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";

src/qt/platformstyle.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ void MakeSingleColorImage(QImage& img, const QColor& colorbase)
4848
QIcon ColorizeIcon(const QIcon& ico, const QColor& colorbase)
4949
{
5050
QIcon new_ico;
51-
QSize sz;
52-
Q_FOREACH(sz, ico.availableSizes())
51+
Q_FOREACH(const QSize sz, ico.availableSizes())
5352
{
5453
QImage img(ico.pixmap(sz).toImage());
5554
MakeSingleColorImage(img, colorbase);

src/utilstrencodings.h

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
#define UBEGIN(a) ((unsigned char*)&(a))
1919
#define UEND(a) ((unsigned char*)&((&(a))[1]))
2020
#define ARRAYLEN(array) (sizeof(array)/sizeof((array)[0]))
21-
22-
/** This is needed because the foreach macro can't get over the comma in pair<t1, t2> */
2321
#define PAIRTYPE(t1, t2) std::pair<t1, t2>
2422

2523
/** Used by SanitizeString() */

0 commit comments

Comments
 (0)