Skip to content

Commit c05f969

Browse files
sipasipa
committed
Avoid 'foreach' in Qt code as it clashes with boost::foreach
1 parent 7cdefb9 commit c05f969

19 files changed

+31
-27
lines changed

‎src/chain.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <vector>
1616

17+
#undef foreach
1718
#include <boost/foreach.hpp>
1819

1920
struct CDiskBlockPos

‎src/coins.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <assert.h>
1515
#include <stdint.h>
1616

17+
#undef foreach
1718
#include <boost/foreach.hpp>
1819
#include <boost/unordered_map.hpp>
1920

‎src/memusage.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <set>
1212
#include <vector>
1313

14+
#undef foreach
1415
#include <boost/foreach.hpp>
1516
#include <boost/unordered_set.hpp>
1617
#include <boost/unordered_map.hpp>

‎src/net.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <arpa/inet.h>
2727
#endif
2828

29+
#undef foreach
2930
#include <boost/filesystem/path.hpp>
3031
#include <boost/foreach.hpp>
3132
#include <boost/signals2/signal.hpp>

‎src/qt/addressbookpage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ void AddressBookPage::done(int retval)
254254
// Figure out which address was selected, and return it
255255
QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address);
256256

257-
foreach (const QModelIndex& index, indexes) {
257+
Q_FOREACH (const QModelIndex& index, indexes) {
258258
QVariant address = table->model()->data(index);
259259
returnValue = address.toString();
260260
}

‎src/qt/bitcoingui.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ void BitcoinGUI::dropEvent(QDropEvent *event)
886886
{
887887
if(event->mimeData()->hasUrls())
888888
{
889-
foreach(const QUrl &uri, event->mimeData()->urls())
889+
Q_FOREACH(const QUrl &uri, event->mimeData()->urls())
890890
{
891891
emit receivedURI(uri.toString());
892892
}
@@ -1050,7 +1050,7 @@ UnitDisplayStatusBarControl::UnitDisplayStatusBarControl() :
10501050
QList<BitcoinUnits::Unit> units = BitcoinUnits::availableUnits();
10511051
int max_width = 0;
10521052
const QFontMetrics fm(font());
1053-
foreach (const BitcoinUnits::Unit unit, units)
1053+
Q_FOREACH (const BitcoinUnits::Unit unit, units)
10541054
{
10551055
max_width = qMax(max_width, fm.width(BitcoinUnits::name(unit)));
10561056
}
@@ -1069,7 +1069,7 @@ void UnitDisplayStatusBarControl::mousePressEvent(QMouseEvent *event)
10691069
void UnitDisplayStatusBarControl::createContextMenu()
10701070
{
10711071
menu = new QMenu();
1072-
foreach(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
1072+
Q_FOREACH(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
10731073
{
10741074
QAction *menuAction = new QAction(QString(BitcoinUnits::name(u)), this);
10751075
menuAction->setData(QVariant(u));

‎src/qt/coincontroldialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
461461
CAmount nPayAmount = 0;
462462
bool fDust = false;
463463
CMutableTransaction txDummy;
464-
foreach(const CAmount &amount, CoinControlDialog::payAmounts)
464+
Q_FOREACH(const CAmount &amount, CoinControlDialog::payAmounts)
465465
{
466466
nPayAmount += amount;
467467

‎src/qt/optionsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
7373
/* Display elements init */
7474
QDir translations(":translations");
7575
ui->lang->addItem(QString("(") + tr("default") + QString(")"), QVariant(""));
76-
foreach(const QString &langStr, translations.entryList())
76+
Q_FOREACH(const QString &langStr, translations.entryList())
7777
{
7878
QLocale locale(langStr);
7979

‎src/qt/paymentserver.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
148148
int nRootCerts = 0;
149149
const QDateTime currentTime = QDateTime::currentDateTime();
150150

151-
foreach (const QSslCertificate& cert, certList) {
151+
Q_FOREACH (const QSslCertificate& cert, certList) {
152152
// Don't log NULL certificates
153153
if (cert.isNull())
154154
continue;
@@ -269,7 +269,7 @@ void PaymentServer::ipcParseCommandLine(int argc, char* argv[])
269269
bool PaymentServer::ipcSendCommandLine()
270270
{
271271
bool fResult = false;
272-
foreach (const QString& r, savedPaymentRequests)
272+
Q_FOREACH (const QString& r, savedPaymentRequests)
273273
{
274274
QLocalSocket* socket = new QLocalSocket();
275275
socket->connectToServer(ipcServerName(), QIODevice::WriteOnly);
@@ -394,7 +394,7 @@ void PaymentServer::uiReady()
394394
initNetManager();
395395

396396
saveURIs = false;
397-
foreach (const QString& s, savedPaymentRequests)
397+
Q_FOREACH (const QString& s, savedPaymentRequests)
398398
{
399399
handleURIOrFile(s);
400400
}
@@ -562,7 +562,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen
562562
QList<std::pair<CScript, CAmount> > sendingTos = request.getPayTo();
563563
QStringList addresses;
564564

565-
foreach(const PAIRTYPE(CScript, CAmount)& sendingTo, sendingTos) {
565+
Q_FOREACH(const PAIRTYPE(CScript, CAmount)& sendingTo, sendingTos) {
566566
// Extract and check destination addresses
567567
CTxDestination dest;
568568
if (ExtractDestination(sendingTo.first, dest)) {
@@ -750,7 +750,7 @@ void PaymentServer::reportSslErrors(QNetworkReply* reply, const QList<QSslError>
750750
Q_UNUSED(reply);
751751

752752
QString errString;
753-
foreach (const QSslError& err, errs) {
753+
Q_FOREACH (const QSslError& err, errs) {
754754
qWarning() << "PaymentServer::reportSslErrors: " << err;
755755
errString += err.errorString() + "\n";
756756
}

‎src/qt/peertablemodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class PeerTablePriv
6363
#if QT_VERSION >= 0x040700
6464
cachedNodeStats.reserve(vNodes.size());
6565
#endif
66-
foreach (CNode* pnode, vNodes)
66+
Q_FOREACH (CNode* pnode, vNodes)
6767
{
6868
CNodeCombinedStats stats;
6969
stats.nodeStateStats.nMisbehavior = 0;
@@ -92,7 +92,7 @@ class PeerTablePriv
9292
// build index map
9393
mapNodeRows.clear();
9494
int row = 0;
95-
foreach (const CNodeCombinedStats& stats, cachedNodeStats)
95+
Q_FOREACH (const CNodeCombinedStats& stats, cachedNodeStats)
9696
mapNodeRows.insert(std::pair<NodeId, int>(stats.nodeStats.nodeid, row++));
9797
}
9898

‎src/qt/receivecoinsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void ReceiveCoinsDialog::on_showRequestButton_clicked()
185185
return;
186186
QModelIndexList selection = ui->recentRequestsView->selectionModel()->selectedRows();
187187

188-
foreach (const QModelIndex& index, selection) {
188+
Q_FOREACH (const QModelIndex& index, selection) {
189189
on_recentRequestsView_doubleClicked(index);
190190
}
191191
}

‎src/qt/rpcconsole.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ bool parseCommandLine(std::vector<std::string> &args, const std::string &strComm
9595
STATE_ESCAPE_DOUBLEQUOTED
9696
} state = STATE_EATING_SPACES;
9797
std::string curarg;
98-
foreach(char ch, strCommand)
98+
Q_FOREACH(char ch, strCommand)
9999
{
100100
switch(state)
101101
{

‎src/qt/sendcoinsdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ void SendCoinsDialog::on_sendButton_clicked()
251251

252252
// Format confirmation message
253253
QStringList formatted;
254-
foreach(const SendCoinsRecipient &rcp, currentTransaction.getRecipients())
254+
Q_FOREACH(const SendCoinsRecipient &rcp, currentTransaction.getRecipients())
255255
{
256256
// generate bold amount string
257257
QString amount = "<b>" + BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), rcp.amount);
@@ -305,7 +305,7 @@ void SendCoinsDialog::on_sendButton_clicked()
305305
questionString.append("<hr />");
306306
CAmount totalAmount = currentTransaction.getTotalTransactionAmount() + txFee;
307307
QStringList alternativeUnits;
308-
foreach(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
308+
Q_FOREACH(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
309309
{
310310
if(u != model->getOptionsModel()->getDisplayUnit())
311311
alternativeUnits.append(BitcoinUnits::formatHtmlWithUnit(u, totalAmount));

‎src/qt/trafficgraphwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ void TrafficGraphWidget::updateRates()
139139
}
140140

141141
float tmax = 0.0f;
142-
foreach(float f, vSamplesIn) {
142+
Q_FOREACH(float f, vSamplesIn) {
143143
if(f > tmax) tmax = f;
144144
}
145-
foreach(float f, vSamplesOut) {
145+
Q_FOREACH(float f, vSamplesOut) {
146146
if(f > tmax) tmax = f;
147147
}
148148
fMax = tmax;

‎src/qt/transactiondesc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,14 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
243243
strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), rec->idx) + "<br>";
244244

245245
// Message from normal bitcoin:URI (bitcoin:123...?message=example)
246-
foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
246+
Q_FOREACH (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
247247
if (r.first == "Message")
248248
strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(r.second, true) + "<br>";
249249

250250
//
251251
// PaymentRequest info:
252252
//
253-
foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
253+
Q_FOREACH (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
254254
{
255255
if (r.first == "PaymentRequest")
256256
{

‎src/qt/transactiontablemodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class TransactionTablePriv
142142
{
143143
parent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex+toInsert.size()-1);
144144
int insert_idx = lowerIndex;
145-
foreach(const TransactionRecord &rec, toInsert)
145+
Q_FOREACH(const TransactionRecord &rec, toInsert)
146146
{
147147
cachedWallet.insert(insert_idx, rec);
148148
insert_idx += 1;

‎src/qt/utilitydialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
8484
QTextCharFormat bold;
8585
bold.setFontWeight(QFont::Bold);
8686

87-
foreach (const QString &line, coreOptions.split("\n")) {
87+
Q_FOREACH (const QString &line, coreOptions.split("\n")) {
8888
if (line.startsWith(" -"))
8989
{
9090
cursor.currentTable()->appendRows(1);

‎src/qt/walletmodel.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
205205
int nAddresses = 0;
206206

207207
// Pre-check input data for validity
208-
foreach(const SendCoinsRecipient &rcp, recipients)
208+
Q_FOREACH(const SendCoinsRecipient &rcp, recipients)
209209
{
210210
if (rcp.fSubtractFeeFromAmount)
211211
fSubtractFeeFromAmount = true;
@@ -306,7 +306,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
306306
LOCK2(cs_main, wallet->cs_wallet);
307307
CWalletTx *newTx = transaction.getTransaction();
308308

309-
foreach(const SendCoinsRecipient &rcp, transaction.getRecipients())
309+
Q_FOREACH(const SendCoinsRecipient &rcp, transaction.getRecipients())
310310
{
311311
if (rcp.paymentRequest.IsInitialized())
312312
{
@@ -337,7 +337,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
337337

338338
// Add addresses / update labels that we've sent to to the address book,
339339
// and emit coinsSent signal for each recipient
340-
foreach(const SendCoinsRecipient &rcp, transaction.getRecipients())
340+
Q_FOREACH(const SendCoinsRecipient &rcp, transaction.getRecipients())
341341
{
342342
// Don't touch the address book when we have a payment request
343343
if (!rcp.paymentRequest.IsInitialized())

‎src/qt/walletmodeltransaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void WalletModelTransaction::reassignAmounts(int nChangePosRet)
8181
CAmount WalletModelTransaction::getTotalTransactionAmount()
8282
{
8383
CAmount totalTransactionAmount = 0;
84-
foreach(const SendCoinsRecipient &rcp, recipients)
84+
Q_FOREACH(const SendCoinsRecipient &rcp, recipients)
8585
{
8686
totalTransactionAmount += rcp.amount;
8787
}

0 commit comments

Comments
 (0)