aboutsummaryrefslogtreecommitdiff
path: root/src/qt/trafficgraphwidget.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-07-14 13:59:05 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-07-15 10:24:49 +0200
commite092f22951d391a62871ab58abf9c397a656cf03 (patch)
treebebc4542126fa840f2e6380c01747c1f8a062a21 /src/qt/trafficgraphwidget.cpp
parentd7101a6d31966ee2009db752a6bb223f751c164f (diff)
downloadbitcoin-e092f22951d391a62871ab58abf9c397a656cf03.tar.xz
qt: define QT_NO_KEYWORDS
QT_NO_KEYWORDS prevents Qt from defining the `foreach`, `signals`, `slots` and `emit` macros. Avoid overlap between Qt macros and boost - for example #undef hackiness in #6421. Conflicts: src/qt/addressbookpage.cpp src/qt/peertablemodel.cpp src/qt/receivecoinsdialog.cpp src/qt/rpcconsole.cpp Rebased-From: d29ec6c2301e593d577126d1ca85b93307b32bf1 Github-Pull: #6433
Diffstat (limited to 'src/qt/trafficgraphwidget.cpp')
-rw-r--r--src/qt/trafficgraphwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp
index 0b2eb9eaf2..9b67445bc0 100644
--- a/src/qt/trafficgraphwidget.cpp
+++ b/src/qt/trafficgraphwidget.cpp
@@ -139,10 +139,10 @@ void TrafficGraphWidget::updateRates()
}
float tmax = 0.0f;
- foreach(float f, vSamplesIn) {
+ Q_FOREACH(float f, vSamplesIn) {
if(f > tmax) tmax = f;
}
- foreach(float f, vSamplesOut) {
+ Q_FOREACH(float f, vSamplesOut) {
if(f > tmax) tmax = f;
}
fMax = tmax;