Skip to content

Commit 18dc3c3

Browse files
committed
scripted-diff: Remove Q_FOREACH
-BEGIN VERIFY SCRIPT- sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ; -END VERIFY SCRIPT-
1 parent 7c00c26 commit 18dc3c3

17 files changed

+29
-29
lines changed

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-
Q_FOREACH (const QModelIndex& index, indexes) {
257+
for (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
@@ -1006,7 +1006,7 @@ void BitcoinGUI::dropEvent(QDropEvent *event)
10061006
{
10071007
if(event->mimeData()->hasUrls())
10081008
{
1009-
Q_FOREACH(const QUrl &uri, event->mimeData()->urls())
1009+
for (const QUrl &uri : event->mimeData()->urls())
10101010
{
10111011
Q_EMIT receivedURI(uri.toString());
10121012
}
@@ -1202,7 +1202,7 @@ UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle *pl
12021202
QList<BitcoinUnits::Unit> units = BitcoinUnits::availableUnits();
12031203
int max_width = 0;
12041204
const QFontMetrics fm(font());
1205-
Q_FOREACH (const BitcoinUnits::Unit unit, units)
1205+
for (const BitcoinUnits::Unit unit : units)
12061206
{
12071207
max_width = qMax(max_width, fm.width(BitcoinUnits::name(unit)));
12081208
}
@@ -1221,7 +1221,7 @@ void UnitDisplayStatusBarControl::mousePressEvent(QMouseEvent *event)
12211221
void UnitDisplayStatusBarControl::createContextMenu()
12221222
{
12231223
menu = new QMenu(this);
1224-
Q_FOREACH(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
1224+
for (BitcoinUnits::Unit u : BitcoinUnits::availableUnits())
12251225
{
12261226
QAction *menuAction = new QAction(QString(BitcoinUnits::name(u)), this);
12271227
menuAction->setData(QVariant(u));

src/qt/coincontroldialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
426426
CAmount nPayAmount = 0;
427427
bool fDust = false;
428428
CMutableTransaction txDummy;
429-
Q_FOREACH(const CAmount &amount, CoinControlDialog::payAmounts)
429+
for (const CAmount &amount : CoinControlDialog::payAmounts)
430430
{
431431
nPayAmount += amount;
432432

src/qt/optionsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
8484

8585
ui->lang->setToolTip(ui->lang->toolTip().arg(tr(PACKAGE_NAME)));
8686
ui->lang->addItem(QString("(") + tr("default") + QString(")"), QVariant(""));
87-
Q_FOREACH(const QString &langStr, translations.entryList())
87+
for (const QString &langStr : translations.entryList())
8888
{
8989
QLocale locale(langStr);
9090

src/qt/paymentserver.cpp

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

147-
Q_FOREACH (const QSslCertificate& cert, certList) {
147+
for (const QSslCertificate& cert : certList) {
148148
// Don't log NULL certificates
149149
if (cert.isNull())
150150
continue;
@@ -267,7 +267,7 @@ void PaymentServer::ipcParseCommandLine(int argc, char* argv[])
267267
bool PaymentServer::ipcSendCommandLine()
268268
{
269269
bool fResult = false;
270-
Q_FOREACH (const QString& r, savedPaymentRequests)
270+
for (const QString& r : savedPaymentRequests)
271271
{
272272
QLocalSocket* socket = new QLocalSocket();
273273
socket->connectToServer(ipcServerName(), QIODevice::WriteOnly);
@@ -392,7 +392,7 @@ void PaymentServer::uiReady()
392392
initNetManager();
393393

394394
saveURIs = false;
395-
Q_FOREACH (const QString& s, savedPaymentRequests)
395+
for (const QString& s : savedPaymentRequests)
396396
{
397397
handleURIOrFile(s);
398398
}
@@ -555,7 +555,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen
555555
QList<std::pair<CScript, CAmount> > sendingTos = request.getPayTo();
556556
QStringList addresses;
557557

558-
Q_FOREACH(const PAIRTYPE(CScript, CAmount)& sendingTo, sendingTos) {
558+
for (const PAIRTYPE(CScript, CAmount)& sendingTo : sendingTos) {
559559
// Extract and check destination addresses
560560
CTxDestination dest;
561561
if (ExtractDestination(sendingTo.first, dest)) {
@@ -742,7 +742,7 @@ void PaymentServer::reportSslErrors(QNetworkReply* reply, const QList<QSslError>
742742
Q_UNUSED(reply);
743743

744744
QString errString;
745-
Q_FOREACH (const QSslError& err, errs) {
745+
for (const QSslError& err : errs) {
746746
qWarning() << "PaymentServer::reportSslErrors: " << err;
747747
errString += err.errorString() + "\n";
748748
}

src/qt/peertablemodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class PeerTablePriv
6262
#if QT_VERSION >= 0x040700
6363
cachedNodeStats.reserve(vstats.size());
6464
#endif
65-
Q_FOREACH (const CNodeStats& nodestats, vstats)
65+
for (const CNodeStats& nodestats : vstats)
6666
{
6767
CNodeCombinedStats stats;
6868
stats.nodeStateStats.nMisbehavior = 0;
@@ -91,7 +91,7 @@ class PeerTablePriv
9191
// build index map
9292
mapNodeRows.clear();
9393
int row = 0;
94-
Q_FOREACH (const CNodeCombinedStats& stats, cachedNodeStats)
94+
for (const CNodeCombinedStats& stats : cachedNodeStats)
9595
mapNodeRows.insert(std::pair<NodeId, int>(stats.nodeStats.nodeid, row++));
9696
}
9797

src/qt/platformstyle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void MakeSingleColorImage(QImage& img, const QColor& colorbase)
4848
QIcon ColorizeIcon(const QIcon& ico, const QColor& colorbase)
4949
{
5050
QIcon new_ico;
51-
Q_FOREACH(const QSize sz, ico.availableSizes())
51+
for (const QSize sz : ico.availableSizes())
5252
{
5353
QImage img(ico.pixmap(sz).toImage());
5454
MakeSingleColorImage(img, colorbase);

src/qt/receivecoinsdialog.cpp

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

194-
Q_FOREACH (const QModelIndex& index, selection) {
194+
for (const QModelIndex& index : selection) {
195195
on_recentRequestsView_doubleClicked(index);
196196
}
197197
}

src/qt/sendcoinsdialog.cpp

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

266266
// Format confirmation message
267267
QStringList formatted;
268-
Q_FOREACH(const SendCoinsRecipient &rcp, currentTransaction.getRecipients())
268+
for (const SendCoinsRecipient &rcp : currentTransaction.getRecipients())
269269
{
270270
// generate bold amount string
271271
QString amount = "<b>" + BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), rcp.amount);
@@ -319,7 +319,7 @@ void SendCoinsDialog::on_sendButton_clicked()
319319
questionString.append("<hr />");
320320
CAmount totalAmount = currentTransaction.getTotalTransactionAmount() + txFee;
321321
QStringList alternativeUnits;
322-
Q_FOREACH(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
322+
for (BitcoinUnits::Unit u : BitcoinUnits::availableUnits())
323323
{
324324
if(u != model->getOptionsModel()->getDisplayUnit())
325325
alternativeUnits.append(BitcoinUnits::formatHtmlWithUnit(u, totalAmount));

src/qt/splashscreen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void SplashScreen::unsubscribeFromCoreSignals()
188188
uiInterface.InitMessage.disconnect(boost::bind(InitMessage, this, _1));
189189
uiInterface.ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2));
190190
#ifdef ENABLE_WALLET
191-
Q_FOREACH(CWallet* const & pwallet, connectedWallets) {
191+
for (CWallet* const & pwallet : connectedWallets) {
192192
pwallet->ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2));
193193
}
194194
#endif

0 commit comments

Comments
 (0)