replace boost_foreach

This commit is contained in:
Michel van Kessel
2020-12-28 17:28:05 +01:00
parent b9345ac0f3
commit 83b546163b
47 changed files with 394 additions and 360 deletions

View File

@@ -3,22 +3,25 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include "config/bitcoin-config.h"
#include <config/bitcoin-config.h>
#endif
#include "optionsdialog.h"
#include "ui_optionsdialog.h"
#include <qt/optionsdialog.h>
#include <ui_optionsdialog.h>
#include "bitcoinunits.h"
#include "guiutil.h"
#include "optionsmodel.h"
#include <qt/guiutil.h>
#include <qt/bitcoinunits.h>
#include <qt/optionsmodel.h>
#include <qt/platformstyle.h>
#include "main.h" // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
#include "netbase.h"
#include "txdb.h" // for -dbcache defaults
#include <chainparams.h>
#include <main.h> // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
#include <miner.h>
#include <netbase.h>
#include <txdb.h> // for -dbcache defaults
#ifdef ENABLE_WALLET
#include "wallet/wallet.h" // for CWallet::GetRequiredFee()
#include <wallet/wallet.h> // for CWallet::GetRequiredFee()
#endif
#include <boost/thread.hpp>
@@ -71,10 +74,14 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabWindow));
#endif
#ifdef ENABLE_WALLET
/* remove Wallet tab in case of -disablewallet */
if (!enableWallet) {
if (GetBoolArg("-disablewallet", false)) {
#endif // ENABLE_WALLET
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabWallet));
#ifdef ENABLE_WALLET
}
#endif
/* Display elements init */
QDir translations(":translations");
@@ -84,7 +91,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
ui->lang->setToolTip(ui->lang->toolTip().arg(tr(PACKAGE_NAME)));
ui->lang->addItem(QString("(") + tr("default") + QString(")"), QVariant(""));
Q_FOREACH(const QString &langStr, translations.entryList())
for(const QString &langStr: translations.entryList())
{
QLocale locale(langStr);
@@ -220,8 +227,8 @@ void OptionsDialog::on_resetButton_clicked()
{
// confirmation dialog
QMessageBox::StandardButton btnRetVal = QMessageBox::question(this, tr("Confirm options reset"),
tr("Client restart required to activate changes.") + "<br><br>" + tr("Client will be shut down. Do you want to proceed?"),
QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
tr("Client restart required to activate changes.") + "<br><br>" + tr("Client will be shut down. Do you want to proceed?"),
QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
if(btnRetVal == QMessageBox::Cancel)
return;
@@ -331,7 +338,7 @@ void OptionsDialog::updateDefaultProxyNets()
}
ProxyAddressValidator::ProxyAddressValidator(QObject *parent) :
QValidator(parent)
QValidator(parent)
{
}