Avoid 'foreach' in Qt code as it clashes with boost::foreach

sipa · sipa · commit c05f969569ec · 2015-07-11T18:59:25.000+02:00
diff --git a/src/chain.h b/src/chain.h
@@ -14,6 +14,7 @@
 
 #include <vector>
 
+#undef foreach
 #include <boost/foreach.hpp>
 
 struct CDiskBlockPos
diff --git a/src/coins.h b/src/coins.h
@@ -14,6 +14,7 @@
 #include <assert.h>
 #include <stdint.h>
 
+#undef foreach
 #include <boost/foreach.hpp>
 #include <boost/unordered_map.hpp>
 
diff --git a/src/memusage.h b/src/memusage.h
@@ -11,6 +11,7 @@
 #include <set>
 #include <vector>
 
+#undef foreach
 #include <boost/foreach.hpp>
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
diff --git a/src/net.h b/src/net.h
@@ -26,6 +26,7 @@
 #include <arpa/inet.h>
 #endif
 
+#undef foreach
 #include <boost/filesystem/path.hpp>
 #include <boost/foreach.hpp>
 #include <boost/signals2/signal.hpp>
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
@@ -254,7 +254,7 @@ void AddressBookPage::done(int retval)
     // Figure out which address was selected, and return it
     QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address);
 
-    foreach (const QModelIndex& index, indexes) {
+    Q_FOREACH (const QModelIndex& index, indexes) {
         QVariant address = table->model()->data(index);
         returnValue = address.toString();
     }
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -886,7 +886,7 @@ void BitcoinGUI::dropEvent(QDropEvent *event)
 {
     if(event->mimeData()->hasUrls())
     {
-        foreach(const QUrl &uri, event->mimeData()->urls())
+        Q_FOREACH(const QUrl &uri, event->mimeData()->urls())
         {
             emit receivedURI(uri.toString());
         }
@@ -1050,7 +1050,7 @@ UnitDisplayStatusBarControl::UnitDisplayStatusBarControl() :
     QList<BitcoinUnits::Unit> units = BitcoinUnits::availableUnits();
     int max_width = 0;
     const QFontMetrics fm(font());
-    foreach (const BitcoinUnits::Unit unit, units)
+    Q_FOREACH (const BitcoinUnits::Unit unit, units)
     {
         max_width = qMax(max_width, fm.width(BitcoinUnits::name(unit)));
     }
@@ -1069,7 +1069,7 @@ void UnitDisplayStatusBarControl::mousePressEvent(QMouseEvent *event)
 void UnitDisplayStatusBarControl::createContextMenu()
 {
     menu = new QMenu();
-    foreach(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
+    Q_FOREACH(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
     {
         QAction *menuAction = new QAction(QString(BitcoinUnits::name(u)), this);
         menuAction->setData(QVariant(u));
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -461,7 +461,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
     CAmount nPayAmount = 0;
     bool fDust = false;
     CMutableTransaction txDummy;
-    foreach(const CAmount &amount, CoinControlDialog::payAmounts)
+    Q_FOREACH(const CAmount &amount, CoinControlDialog::payAmounts)
     {
         nPayAmount += amount;
 
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
@@ -73,7 +73,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
     /* Display elements init */
     QDir translations(":translations");
     ui->lang->addItem(QString("(") + tr("default") + QString(")"), QVariant(""));
-    foreach(const QString &langStr, translations.entryList())
+    Q_FOREACH(const QString &langStr, translations.entryList())
     {
         QLocale locale(langStr);
 
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
@@ -148,7 +148,7 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
     int nRootCerts = 0;
     const QDateTime currentTime = QDateTime::currentDateTime();
 
-    foreach (const QSslCertificate& cert, certList) {
+    Q_FOREACH (const QSslCertificate& cert, certList) {
         // Don't log NULL certificates
         if (cert.isNull())
             continue;
@@ -269,7 +269,7 @@ void PaymentServer::ipcParseCommandLine(int argc, char* argv[])
 bool PaymentServer::ipcSendCommandLine()
 {
     bool fResult = false;
-    foreach (const QString& r, savedPaymentRequests)
+    Q_FOREACH (const QString& r, savedPaymentRequests)
     {
         QLocalSocket* socket = new QLocalSocket();
         socket->connectToServer(ipcServerName(), QIODevice::WriteOnly);
@@ -394,7 +394,7 @@ void PaymentServer::uiReady()
     initNetManager();
 
     saveURIs = false;
-    foreach (const QString& s, savedPaymentRequests)
+    Q_FOREACH (const QString& s, savedPaymentRequests)
     {
         handleURIOrFile(s);
     }
@@ -562,7 +562,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen
     QList<std::pair<CScript, CAmount> > sendingTos = request.getPayTo();
     QStringList addresses;
 
-    foreach(const PAIRTYPE(CScript, CAmount)& sendingTo, sendingTos) {
+    Q_FOREACH(const PAIRTYPE(CScript, CAmount)& sendingTo, sendingTos) {
         // Extract and check destination addresses
         CTxDestination dest;
         if (ExtractDestination(sendingTo.first, dest)) {
@@ -750,7 +750,7 @@ void PaymentServer::reportSslErrors(QNetworkReply* reply, const QList<QSslError>
     Q_UNUSED(reply);
 
     QString errString;
-    foreach (const QSslError& err, errs) {
+    Q_FOREACH (const QSslError& err, errs) {
         qWarning() << "PaymentServer::reportSslErrors: " << err;
         errString += err.errorString() + "\n";
     }
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
@@ -63,7 +63,7 @@ class PeerTablePriv
 #if QT_VERSION >= 0x040700
             cachedNodeStats.reserve(vNodes.size());
 #endif
-            foreach (CNode* pnode, vNodes)
+            Q_FOREACH (CNode* pnode, vNodes)
             {
                 CNodeCombinedStats stats;
                 stats.nodeStateStats.nMisbehavior = 0;
@@ -92,7 +92,7 @@ class PeerTablePriv
         // build index map
         mapNodeRows.clear();
         int row = 0;
-        foreach (const CNodeCombinedStats& stats, cachedNodeStats)
+        Q_FOREACH (const CNodeCombinedStats& stats, cachedNodeStats)
             mapNodeRows.insert(std::pair<NodeId, int>(stats.nodeStats.nodeid, row++));
     }
 
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
@@ -185,7 +185,7 @@ void ReceiveCoinsDialog::on_showRequestButton_clicked()
         return;
     QModelIndexList selection = ui->recentRequestsView->selectionModel()->selectedRows();
 
-    foreach (const QModelIndex& index, selection) {
+    Q_FOREACH (const QModelIndex& index, selection) {
         on_recentRequestsView_doubleClicked(index);
     }
 }
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -95,7 +95,7 @@ bool parseCommandLine(std::vector<std::string> &args, const std::string &strComm
         STATE_ESCAPE_DOUBLEQUOTED
     } state = STATE_EATING_SPACES;
     std::string curarg;
-    foreach(char ch, strCommand)
+    Q_FOREACH(char ch, strCommand)
     {
         switch(state)
         {
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -251,7 +251,7 @@ void SendCoinsDialog::on_sendButton_clicked()
 
     // Format confirmation message
     QStringList formatted;
-    foreach(const SendCoinsRecipient &rcp, currentTransaction.getRecipients())
+    Q_FOREACH(const SendCoinsRecipient &rcp, currentTransaction.getRecipients())
     {
         // generate bold amount string
         QString amount = "<b>" + BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), rcp.amount);
@@ -305,7 +305,7 @@ void SendCoinsDialog::on_sendButton_clicked()
     questionString.append("<hr />");
     CAmount totalAmount = currentTransaction.getTotalTransactionAmount() + txFee;
     QStringList alternativeUnits;
-    foreach(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
+    Q_FOREACH(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
     {
         if(u != model->getOptionsModel()->getDisplayUnit())
             alternativeUnits.append(BitcoinUnits::formatHtmlWithUnit(u, totalAmount));
diff --git 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;
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
@@ -243,14 +243,14 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
     strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), rec->idx) + "<br>";
 
     // Message from normal bitcoin:URI (bitcoin:123...?message=example)
-    foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
+    Q_FOREACH (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
         if (r.first == "Message")
             strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(r.second, true) + "<br>";
 
     //
     // PaymentRequest info:
     //
-    foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
+    Q_FOREACH (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
     {
         if (r.first == "PaymentRequest")
         {
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -142,7 +142,7 @@ class TransactionTablePriv
                 {
                     parent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex+toInsert.size()-1);
                     int insert_idx = lowerIndex;
-                    foreach(const TransactionRecord &rec, toInsert)
+                    Q_FOREACH(const TransactionRecord &rec, toInsert)
                     {
                         cachedWallet.insert(insert_idx, rec);
                         insert_idx += 1;
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
@@ -84,7 +84,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
         QTextCharFormat bold;
         bold.setFontWeight(QFont::Bold);
 
-        foreach (const QString &line, coreOptions.split("\n")) {
+        Q_FOREACH (const QString &line, coreOptions.split("\n")) {
             if (line.startsWith("  -"))
             {
                 cursor.currentTable()->appendRows(1);
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -205,7 +205,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
     int nAddresses = 0;
 
     // Pre-check input data for validity
-    foreach(const SendCoinsRecipient &rcp, recipients)
+    Q_FOREACH(const SendCoinsRecipient &rcp, recipients)
     {
         if (rcp.fSubtractFeeFromAmount)
             fSubtractFeeFromAmount = true;
@@ -306,7 +306,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
         LOCK2(cs_main, wallet->cs_wallet);
         CWalletTx *newTx = transaction.getTransaction();
 
-        foreach(const SendCoinsRecipient &rcp, transaction.getRecipients())
+        Q_FOREACH(const SendCoinsRecipient &rcp, transaction.getRecipients())
         {
             if (rcp.paymentRequest.IsInitialized())
             {
@@ -337,7 +337,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
 
     // Add addresses / update labels that we've sent to to the address book,
     // and emit coinsSent signal for each recipient
-    foreach(const SendCoinsRecipient &rcp, transaction.getRecipients())
+    Q_FOREACH(const SendCoinsRecipient &rcp, transaction.getRecipients())
     {
         // Don't touch the address book when we have a payment request
         if (!rcp.paymentRequest.IsInitialized())
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
@@ -81,7 +81,7 @@ void WalletModelTransaction::reassignAmounts(int nChangePosRet)
 CAmount WalletModelTransaction::getTotalTransactionAmount()
 {
     CAmount totalTransactionAmount = 0;
-    foreach(const SendCoinsRecipient &rcp, recipients)
+    Q_FOREACH(const SendCoinsRecipient &rcp, recipients)
     {
         totalTransactionAmount += rcp.amount;
     }

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ void AddressBookPage::done(int retval)`
`254`	`254`	`// Figure out which address was selected, and return it`
`255`	`255`	`QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address);`
`256`	`256`
`257`		`- foreach (const QModelIndex& index, indexes) {`
	`257`	`+ Q_FOREACH (const QModelIndex& index, indexes) {`
`258`	`258`	`QVariant address = table->model()->data(index);`
`259`	`259`	`returnValue = address.toString();`
`260`	`260`	`}`
Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ void BitcoinGUI::dropEvent(QDropEvent *event)`
`886`	`886`	`{`
`887`	`887`	`if(event->mimeData()->hasUrls())`
`888`	`888`	`{`
`889`		`- foreach(const QUrl &uri, event->mimeData()->urls())`
	`889`	`+ Q_FOREACH(const QUrl &uri, event->mimeData()->urls())`
`890`	`890`	`{`
`891`	`891`	`emit receivedURI(uri.toString());`
`892`	`892`	`}`
`@@ -1050,7 +1050,7 @@ UnitDisplayStatusBarControl::UnitDisplayStatusBarControl() :`
`1050`	`1050`	`QList<BitcoinUnits::Unit> units = BitcoinUnits::availableUnits();`
`1051`	`1051`	`int max_width = 0;`
`1052`	`1052`	`const QFontMetrics fm(font());`
`1053`		`- foreach (const BitcoinUnits::Unit unit, units)`
	`1053`	`+ Q_FOREACH (const BitcoinUnits::Unit unit, units)`
`1054`	`1054`	`{`
`1055`	`1055`	`max_width = qMax(max_width, fm.width(BitcoinUnits::name(unit)));`
`1056`	`1056`	`}`
`@@ -1069,7 +1069,7 @@ void UnitDisplayStatusBarControl::mousePressEvent(QMouseEvent *event)`
`1069`	`1069`	`void UnitDisplayStatusBarControl::createContextMenu()`
`1070`	`1070`	`{`
`1071`	`1071`	`menu = new QMenu();`
`1072`		`- foreach(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())`
	`1072`	`+ Q_FOREACH(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())`
`1073`	`1073`	`{`
`1074`	`1074`	`QAction *menuAction = new QAction(QString(BitcoinUnits::name(u)), this);`
`1075`	`1075`	`menuAction->setData(QVariant(u));`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ void CoinControlDialog::updateLabels(WalletModel model, QDialog dialog)`
`461`	`461`	`CAmount nPayAmount = 0;`
`462`	`462`	`bool fDust = false;`
`463`	`463`	`CMutableTransaction txDummy;`
`464`		`- foreach(const CAmount &amount, CoinControlDialog::payAmounts)`
	`464`	`+ Q_FOREACH(const CAmount &amount, CoinControlDialog::payAmounts)`
`465`	`465`	`{`
`466`	`466`	`nPayAmount += amount;`
`467`	`467`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :`
`73`	`73`	`/* Display elements init */`
`74`	`74`	`QDir translations(":translations");`
`75`	`75`	`ui->lang->addItem(QString("(") + tr("default") + QString(")"), QVariant(""));`
`76`		`- foreach(const QString &langStr, translations.entryList())`
	`76`	`+ Q_FOREACH(const QString &langStr, translations.entryList())`
`77`	`77`	`{`
`78`	`78`	`QLocale locale(langStr);`
`79`	`79`