ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix Qt6 deprecation warnings

This commit is contained in:
oltolm 2024-11-01 13:05:14 +01:00
parent b25e293cc8
commit 49c72efcd3
12 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp
View File

@ -140,6 +140,16 @@ void HacksWidget::OnBackendChanged(const QString& backend_name)
void HacksWidget::ConnectWidgets() void HacksWidget::ConnectWidgets()
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(m_store_efb_copies, &QCheckBox::checkStateChanged,
[this](Qt::CheckState) { UpdateDeferEFBCopiesEnabled(); });
connect(m_store_xfb_copies, &QCheckBox::checkStateChanged,
[this](Qt::CheckState) { UpdateDeferEFBCopiesEnabled(); });
connect(m_immediate_xfb, &QCheckBox::checkStateChanged,
[this](Qt::CheckState) { UpdateSkipPresentingDuplicateFramesEnabled(); });
connect(m_vi_skip, &QCheckBox::checkStateChanged,
[this](Qt::CheckState) { UpdateSkipPresentingDuplicateFramesEnabled(); });
#else
connect(m_store_efb_copies, &QCheckBox::stateChanged, connect(m_store_efb_copies, &QCheckBox::stateChanged,
[this](int) { UpdateDeferEFBCopiesEnabled(); }); [this](int) { UpdateDeferEFBCopiesEnabled(); });
connect(m_store_xfb_copies, &QCheckBox::stateChanged, connect(m_store_xfb_copies, &QCheckBox::stateChanged,
@ -148,6 +158,7 @@ void HacksWidget::ConnectWidgets()
[this](int) { UpdateSkipPresentingDuplicateFramesEnabled(); }); [this](int) { UpdateSkipPresentingDuplicateFramesEnabled(); });
connect(m_vi_skip, &QCheckBox::stateChanged, connect(m_vi_skip, &QCheckBox::stateChanged,
[this](int) { UpdateSkipPresentingDuplicateFramesEnabled(); }); [this](int) { UpdateSkipPresentingDuplicateFramesEnabled(); });
#endif
} }
void HacksWidget::AddDescriptions() void HacksWidget::AddDescriptions()

4
Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
View File

@ -76,7 +76,11 @@ MappingBool::MappingBool(MappingWidget* parent, ControllerEmu::NumericSetting<bo
if (const auto ui_description = m_setting.GetUIDescription()) if (const auto ui_description = m_setting.GetUIDescription())
setToolTip(tr(ui_description)); setToolTip(tr(ui_description));
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(this, &QCheckBox::checkStateChanged, this, [this, parent](Qt::CheckState value) {
#else
connect(this, &QCheckBox::stateChanged, this, [this, parent](int value) { connect(this, &QCheckBox::stateChanged, this, [this, parent](int value) {
#endif
m_setting.SetValue(value != 0); m_setting.SetValue(value != 0);
ConfigChanged(); ConfigChanged();
parent->SaveSettings(); parent->SaveSettings();

5
Source/Core/DolphinQt/Config/VerifyWidget.cpp
View File

@ -120,8 +120,13 @@ void VerifyWidget::ConnectWidgets()
{ {
connect(m_verify_button, &QPushButton::clicked, this, &VerifyWidget::Verify); connect(m_verify_button, &QPushButton::clicked, this, &VerifyWidget::Verify);
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(m_md5_checkbox, &QCheckBox::checkStateChanged, this, &VerifyWidget::UpdateRedumpEnabled);
connect(m_sha1_checkbox, &QCheckBox::checkStateChanged, this, &VerifyWidget::UpdateRedumpEnabled);
#else
connect(m_md5_checkbox, &QCheckBox::stateChanged, this, &VerifyWidget::UpdateRedumpEnabled); connect(m_md5_checkbox, &QCheckBox::stateChanged, this, &VerifyWidget::UpdateRedumpEnabled);
connect(m_sha1_checkbox, &QCheckBox::stateChanged, this, &VerifyWidget::UpdateRedumpEnabled); connect(m_sha1_checkbox, &QCheckBox::stateChanged, this, &VerifyWidget::UpdateRedumpEnabled);
#endif
} }
static void SetHash(QLineEdit* line_edit, const std::vector<u8>& hash) static void SetHash(QLineEdit* line_edit, const std::vector<u8>& hash)

4
Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
View File

@ -884,7 +884,11 @@ std::vector<u8> MemoryViewWidget::ConvertTextToBytes(Type type, QStringView inpu
// Confirm it is only hex bytes // Confirm it is only hex bytes
const QRegularExpression is_hex(QStringLiteral("^([0-9A-F]{2})*$"), const QRegularExpression is_hex(QStringLiteral("^([0-9A-F]{2})*$"),
QRegularExpression::CaseInsensitiveOption); QRegularExpression::CaseInsensitiveOption);
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
const QRegularExpressionMatch match = is_hex.matchView(input_text);
#else
const QRegularExpressionMatch match = is_hex.match(input_text); const QRegularExpressionMatch match = is_hex.match(input_text);
#endif
good = match.hasMatch(); good = match.hasMatch();
if (good) if (good)
{ {

21
Source/Core/DolphinQt/Debugger/NetworkWidget.cpp
View File

@ -209,6 +209,26 @@ void NetworkWidget::ConnectWidgets()
{ {
connect(m_dump_format_combo, &QComboBox::currentIndexChanged, this, connect(m_dump_format_combo, &QComboBox::currentIndexChanged, this,
&NetworkWidget::OnDumpFormatComboChanged); &NetworkWidget::OnDumpFormatComboChanged);
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(m_dump_ssl_read_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_READ, state == Qt::Checked);
});
connect(m_dump_ssl_write_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_WRITE, state == Qt::Checked);
});
connect(m_dump_root_ca_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_ROOT_CA, state == Qt::Checked);
});
connect(m_dump_peer_cert_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_PEER_CERT, state == Qt::Checked);
});
connect(m_verify_certificates_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_VERIFY_CERTIFICATES, state == Qt::Checked);
});
connect(m_dump_bba_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
Config::SetBaseOrCurrent(Config::MAIN_NETWORK_DUMP_BBA, state == Qt::Checked);
});
#else
connect(m_dump_ssl_read_checkbox, &QCheckBox::stateChanged, [](int state) { connect(m_dump_ssl_read_checkbox, &QCheckBox::stateChanged, [](int state) {
Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_READ, state == Qt::Checked); Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_READ, state == Qt::Checked);
}); });
@ -227,6 +247,7 @@ void NetworkWidget::ConnectWidgets()
connect(m_dump_bba_checkbox, &QCheckBox::stateChanged, [](int state) { connect(m_dump_bba_checkbox, &QCheckBox::stateChanged, [](int state) {
Config::SetBaseOrCurrent(Config::MAIN_NETWORK_DUMP_BBA, state == Qt::Checked); Config::SetBaseOrCurrent(Config::MAIN_NETWORK_DUMP_BBA, state == Qt::Checked);
}); });
#endif
connect(m_open_dump_folder, &QPushButton::clicked, [] { connect(m_open_dump_folder, &QPushButton::clicked, [] {
const std::string location = File::GetUserPath(D_DUMPSSL_IDX); const std::string location = File::GetUserPath(D_DUMPSSL_IDX);
const QUrl url = QUrl::fromLocalFile(QString::fromStdString(location)); const QUrl url = QUrl::fromLocalFile(QString::fromStdString(location));

5
Source/Core/DolphinQt/NKitWarningDialog.cpp
View File

@ -77,8 +77,13 @@ NKitWarningDialog::NKitWarningDialog(QWidget* parent) : QDialog(parent)
connect(cancel, &QPushButton::clicked, this, &QDialog::reject); connect(cancel, &QPushButton::clicked, this, &QDialog::reject);
ok->setEnabled(false); ok->setEnabled(false);
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(checkbox_accept, &QCheckBox::checkStateChanged,
[ok](Qt::CheckState state) { ok->setEnabled(state == Qt::Checked); });
#else
connect(checkbox_accept, &QCheckBox::stateChanged, connect(checkbox_accept, &QCheckBox::stateChanged,
[ok](int state) { ok->setEnabled(state == Qt::Checked); }); [ok](int state) { ok->setEnabled(state == Qt::Checked); });
#endif
connect(this, &QDialog::accepted, [checkbox_skip] { connect(this, &QDialog::accepted, [checkbox_skip] {
Config::SetBase(Config::MAIN_SKIP_NKIT_WARNING, checkbox_skip->isChecked()); Config::SetBase(Config::MAIN_SKIP_NKIT_WARNING, checkbox_skip->isChecked());

4
Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp
View File

@ -242,7 +242,11 @@ void NetPlaySetupDialog::ConnectWidgets()
&NetPlaySetupDialog::SaveSettings); &NetPlaySetupDialog::SaveSettings);
#ifdef USE_UPNP #ifdef USE_UPNP
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(m_host_upnp, &QCheckBox::checkStateChanged, this, &NetPlaySetupDialog::SaveSettings);
#else
connect(m_host_upnp, &QCheckBox::stateChanged, this, &NetPlaySetupDialog::SaveSettings); connect(m_host_upnp, &QCheckBox::stateChanged, this, &NetPlaySetupDialog::SaveSettings);
#endif
#endif #endif
connect(m_connect_button, &QPushButton::clicked, this, &QDialog::accept); connect(m_connect_button, &QPushButton::clicked, this, &QDialog::accept);

4
Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
View File

@ -60,7 +60,11 @@ void PadMappingDialog::ConnectWidgets()
} }
for (const auto& checkbox : m_gba_boxes) for (const auto& checkbox : m_gba_boxes)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(checkbox, &QCheckBox::checkStateChanged, this, &PadMappingDialog::OnMappingChanged);
#else
connect(checkbox, &QCheckBox::stateChanged, this, &PadMappingDialog::OnMappingChanged); connect(checkbox, &QCheckBox::stateChanged, this, &PadMappingDialog::OnMappingChanged);
#endif
} }
} }

10
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
View File

@ -12,6 +12,7 @@
#include <QLabel> #include <QLabel>
#include <QRadioButton> #include <QRadioButton>
#include <QSignalBlocker> #include <QSignalBlocker>
#include <QTimeZone>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <cmath> #include <cmath>
@ -251,9 +252,18 @@ void AdvancedPane::CreateLayout()
QStringLiteral("mm"), QStringLiteral("mm:ss"))); QStringLiteral("mm"), QStringLiteral("mm:ss")));
QtUtils::ShowFourDigitYear(m_custom_rtc_datetime); QtUtils::ShowFourDigitYear(m_custom_rtc_datetime);
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
m_custom_rtc_datetime->setDateTimeRange(QDateTime({2000, 1, 1}, {0, 0, 0}, QTimeZone::UTC),
QDateTime({2099, 12, 31}, {23, 59, 59}, QTimeZone::UTC));
#else
m_custom_rtc_datetime->setDateTimeRange(QDateTime({2000, 1, 1}, {0, 0, 0}, Qt::UTC), m_custom_rtc_datetime->setDateTimeRange(QDateTime({2000, 1, 1}, {0, 0, 0}, Qt::UTC),
QDateTime({2099, 12, 31}, {23, 59, 59}, Qt::UTC)); QDateTime({2099, 12, 31}, {23, 59, 59}, Qt::UTC));
#endif
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
m_custom_rtc_datetime->setTimeZone(QTimeZone::UTC);
#else
m_custom_rtc_datetime->setTimeSpec(Qt::UTC); m_custom_rtc_datetime->setTimeSpec(Qt::UTC);
#endif
rtc_options->layout()->addWidget(m_custom_rtc_datetime); rtc_options->layout()->addWidget(m_custom_rtc_datetime);
m_custom_rtc_checkbox->SetDescription( m_custom_rtc_checkbox->SetDescription(

14
Source/Core/DolphinQt/Settings/GameCubePane.cpp
View File

@ -241,7 +241,11 @@ void GameCubePane::CreateWidgets()
void GameCubePane::ConnectWidgets() void GameCubePane::ConnectWidgets()
{ {
// IPL Settings // IPL Settings
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(m_skip_main_menu, &QCheckBox::checkStateChanged, this, &GameCubePane::SaveSettings);
#else
connect(m_skip_main_menu, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings); connect(m_skip_main_menu, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings);
#endif
connect(m_language_combo, &QComboBox::currentIndexChanged, this, &GameCubePane::SaveSettings); connect(m_language_combo, &QComboBox::currentIndexChanged, this, &GameCubePane::SaveSettings);
// Device Settings // Device Settings
@ -272,10 +276,20 @@ void GameCubePane::ConnectWidgets()
#ifdef HAS_LIBMGBA #ifdef HAS_LIBMGBA
// GBA Settings // GBA Settings
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(m_gba_threads, &QCheckBox::checkStateChanged, this, &GameCubePane::SaveSettings);
#else
connect(m_gba_threads, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings); connect(m_gba_threads, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings);
#endif
connect(m_gba_bios_edit, &QLineEdit::editingFinished, this, &GameCubePane::SaveSettings); connect(m_gba_bios_edit, &QLineEdit::editingFinished, this, &GameCubePane::SaveSettings);
connect(m_gba_browse_bios, &QPushButton::clicked, this, &GameCubePane::BrowseGBABios); connect(m_gba_browse_bios, &QPushButton::clicked, this, &GameCubePane::BrowseGBABios);
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(m_gba_save_rom_path, &QCheckBox::checkStateChanged, this,
&GameCubePane::SaveRomPathChanged);
#else
connect(m_gba_save_rom_path, &QCheckBox::stateChanged, this, &GameCubePane::SaveRomPathChanged); connect(m_gba_save_rom_path, &QCheckBox::stateChanged, this, &GameCubePane::SaveRomPathChanged);
#endif
connect(m_gba_saves_edit, &QLineEdit::editingFinished, this, &GameCubePane::SaveSettings); connect(m_gba_saves_edit, &QLineEdit::editingFinished, this, &GameCubePane::SaveSettings);
connect(m_gba_browse_saves, &QPushButton::clicked, this, &GameCubePane::BrowseGBASaves); connect(m_gba_browse_saves, &QPushButton::clicked, this, &GameCubePane::BrowseGBASaves);
for (size_t i = 0; i < m_gba_browse_roms.size(); ++i) for (size_t i = 0; i < m_gba_browse_roms.size(); ++i)

8
Source/Core/DolphinQt/TAS/TASCheckBox.cpp
View File

@ -15,7 +15,11 @@ TASCheckBox::TASCheckBox(const QString& text, TASInputWindow* parent)
{ {
setTristate(true); setTristate(true);
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
connect(this, &TASCheckBox::checkStateChanged, this, &TASCheckBox::OnUIValueChanged);
#else
connect(this, &TASCheckBox::stateChanged, this, &TASCheckBox::OnUIValueChanged); connect(this, &TASCheckBox::stateChanged, this, &TASCheckBox::OnUIValueChanged);
#endif
} }
bool TASCheckBox::GetValue() const bool TASCheckBox::GetValue() const
@ -58,7 +62,11 @@ void TASCheckBox::mousePressEvent(QMouseEvent* event)
setCheckState(Qt::PartiallyChecked); setCheckState(Qt::PartiallyChecked);
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
void TASCheckBox::OnUIValueChanged(Qt::CheckState new_value)
#else
void TASCheckBox::OnUIValueChanged(int new_value) void TASCheckBox::OnUIValueChanged(int new_value)
#endif
{ {
m_state.OnUIValueChanged(new_value); m_state.OnUIValueChanged(new_value);
} }

4
Source/Core/DolphinQt/TAS/TASCheckBox.h
View File

@ -25,7 +25,11 @@ protected:
void mousePressEvent(QMouseEvent* event) override; void mousePressEvent(QMouseEvent* event) override;
private slots: private slots:
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
void OnUIValueChanged(Qt::CheckState new_value);
#else
void OnUIValueChanged(int new_value); void OnUIValueChanged(int new_value);
#endif
void ApplyControllerValueChange(); void ApplyControllerValueChange();
private: private: