mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-29 14:59:39 -04:00
qt, refactor: Remove outdated Qt version-specific code
Since bitcoin/bitcoin#30997, the minimum supported Qt version is 6.2.
This commit is contained in:
parent
639279e86a
commit
4b36ab3a6a
8 changed files with 0 additions and 56 deletions
|
@ -15,11 +15,7 @@
|
|||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
#include <QSortFilterProxyModel>
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||
#include <QRegularExpression>
|
||||
#else
|
||||
#include <QRegExp>
|
||||
#endif
|
||||
|
||||
class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
|
||||
{
|
||||
|
@ -47,11 +43,7 @@ protected:
|
|||
|
||||
auto address = model->index(row, AddressTableModel::Address, parent);
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||
const auto pattern = filterRegularExpression();
|
||||
#else
|
||||
const auto pattern = filterRegExp();
|
||||
#endif
|
||||
return (model->data(address).toString().contains(pattern) ||
|
||||
model->data(label).toString().contains(pattern));
|
||||
}
|
||||
|
|
|
@ -90,12 +90,7 @@ static void RegisterMetaTypes()
|
|||
qRegisterMetaType<std::function<void()>>("std::function<void()>");
|
||||
qRegisterMetaType<QMessageBox::Icon>("QMessageBox::Icon");
|
||||
qRegisterMetaType<interfaces::BlockAndHeaderTipInfo>("interfaces::BlockAndHeaderTipInfo");
|
||||
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||
qRegisterMetaTypeStreamOperators<BitcoinUnit>("BitcoinUnit");
|
||||
#else
|
||||
qRegisterMetaType<BitcoinUnit>("BitcoinUnit");
|
||||
#endif
|
||||
}
|
||||
|
||||
static QString GetLangTerritory()
|
||||
|
@ -134,11 +129,7 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans
|
|||
// - First load the translator for the base language, without territory
|
||||
// - Then load the more specific locale translator
|
||||
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||
const QString translation_path{QLibraryInfo::location(QLibraryInfo::TranslationsPath)};
|
||||
#else
|
||||
const QString translation_path{QLibraryInfo::path(QLibraryInfo::TranslationsPath)};
|
||||
#endif
|
||||
// Load e.g. qt_de.qm
|
||||
if (qtTranslatorBase.load("qt_" + lang, translation_path)) {
|
||||
QApplication::installTranslator(&qtTranslatorBase);
|
||||
|
@ -508,12 +499,6 @@ int GuiMain(int argc, char* argv[])
|
|||
Q_INIT_RESOURCE(bitcoin);
|
||||
Q_INIT_RESOURCE(bitcoin_locale);
|
||||
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||
// Generate high-dpi pixmaps
|
||||
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
#endif
|
||||
|
||||
#if defined(QT_QPA_PLATFORM_ANDROID)
|
||||
QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
|
||||
QApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
|
||||
|
|
|
@ -954,20 +954,12 @@ void PopupMenu(QMenu* menu, const QPoint& point, QAction* at_action)
|
|||
|
||||
QDateTime StartOfDay(const QDate& date)
|
||||
{
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
|
||||
return date.startOfDay();
|
||||
#else
|
||||
return QDateTime(date);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool HasPixmap(const QLabel* label)
|
||||
{
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
|
||||
return !label->pixmap(Qt::ReturnByValue).isNull();
|
||||
#else
|
||||
return label->pixmap() != nullptr;
|
||||
#endif
|
||||
}
|
||||
|
||||
QImage GetImage(const QLabel* label)
|
||||
|
@ -976,11 +968,7 @@ QImage GetImage(const QLabel* label)
|
|||
return QImage();
|
||||
}
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
|
||||
return label->pixmap(Qt::ReturnByValue).toImage();
|
||||
#else
|
||||
return label->pixmap()->toImage();
|
||||
#endif
|
||||
}
|
||||
|
||||
QString MakeHtmlLink(const QString& source, const QString& link)
|
||||
|
|
|
@ -362,11 +362,7 @@ namespace GUIUtil
|
|||
template <typename SeparatorType>
|
||||
QStringList SplitSkipEmptyParts(const QString& string, const SeparatorType& separator)
|
||||
{
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
|
||||
return string.split(separator, Qt::SkipEmptyParts);
|
||||
#else
|
||||
return string.split(separator, QString::SkipEmptyParts);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -164,11 +164,7 @@ OptionsDialog::OptionsDialog(QWidget* parent, bool enableWallet)
|
|||
{
|
||||
/** display language strings as "native language - native country/territory (locale name)", e.g. "Deutsch - Deutschland (de)" */
|
||||
ui->lang->addItem(locale.nativeLanguageName() + QString(" - ") +
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 2, 0))
|
||||
locale.nativeTerritoryName() +
|
||||
#else
|
||||
locale.nativeCountryName() +
|
||||
#endif
|
||||
QString(" (") + langStr + QString(")"), QVariant(langStr));
|
||||
|
||||
}
|
||||
|
|
|
@ -178,13 +178,8 @@ void SendCoinsDialog::setModel(WalletModel *_model)
|
|||
connect(ui->confTargetSelector, qOverload<int>(&QComboBox::currentIndexChanged), this, &SendCoinsDialog::updateSmartFeeLabel);
|
||||
connect(ui->confTargetSelector, qOverload<int>(&QComboBox::currentIndexChanged), this, &SendCoinsDialog::coinControlUpdateLabels);
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
|
||||
connect(ui->groupFee, &QButtonGroup::idClicked, this, &SendCoinsDialog::updateFeeSectionControls);
|
||||
connect(ui->groupFee, &QButtonGroup::idClicked, this, &SendCoinsDialog::coinControlUpdateLabels);
|
||||
#else
|
||||
connect(ui->groupFee, qOverload<int>(&QButtonGroup::buttonClicked), this, &SendCoinsDialog::updateFeeSectionControls);
|
||||
connect(ui->groupFee, qOverload<int>(&QButtonGroup::buttonClicked), this, &SendCoinsDialog::coinControlUpdateLabels);
|
||||
#endif
|
||||
|
||||
connect(ui->customFee, &BitcoinAmountField::valueChanged, this, &SendCoinsDialog::coinControlUpdateLabels);
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
|
||||
|
|
|
@ -12,11 +12,7 @@
|
|||
|
||||
// If we don't want a message to be processed by Qt, return true and set result to
|
||||
// the value that the window procedure should return. Otherwise return false.
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||
bool WinShutdownMonitor::nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr *pnResult)
|
||||
#else
|
||||
bool WinShutdownMonitor::nativeEventFilter(const QByteArray &eventType, void *pMessage, long *pnResult)
|
||||
#endif
|
||||
{
|
||||
Q_UNUSED(eventType);
|
||||
|
||||
|
|
|
@ -20,11 +20,7 @@ public:
|
|||
WinShutdownMonitor(std::function<void()> shutdown_fn) : m_shutdown_fn{std::move(shutdown_fn)} {}
|
||||
|
||||
/** Implements QAbstractNativeEventFilter interface for processing Windows messages */
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||
bool nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr *pnResult) override;
|
||||
#else
|
||||
bool nativeEventFilter(const QByteArray &eventType, void *pMessage, long *pnResult) override;
|
||||
#endif
|
||||
|
||||
/** Register the reason for blocking shutdown on Windows to allow clean client exit */
|
||||
static void registerShutdownBlockReason(const QString& strReason, const HWND& mainWinId);
|
||||
|
|
Loading…
Add table
Reference in a new issue