diff options
| author | oltolm <oleg.tolmatcev@gmail.com> | 2024-11-01 13:05:14 +0100 |
|---|---|---|
| committer | oltolm <oleg.tolmatcev@gmail.com> | 2025-07-19 22:08:15 +0200 |
| commit | 49c72efcd3dd4da70cf9f5fb43ba68cd7db76ce1 (patch) | |
| tree | 6dc3a953a08c85b289d3f96e565ee51fe1e763e9 /Source/Core/DolphinQt/Debugger | |
| parent | b25e293cc83477c11894ec733744d1d2e5c6d1b4 (diff) | |
fix Qt6 deprecation warnings
Diffstat (limited to 'Source/Core/DolphinQt/Debugger')
| -rw-r--r-- | Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/Debugger/NetworkWidget.cpp | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp index ef39421294..ca94fafa21 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp @@ -884,7 +884,11 @@ std::vector<u8> MemoryViewWidget::ConvertTextToBytes(Type type, QStringView inpu // Confirm it is only hex bytes const QRegularExpression is_hex(QStringLiteral("^([0-9A-F]{2})*$"), 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); +#endif good = match.hasMatch(); if (good) { diff --git a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp index e5b91e856a..3d75cca71d 100644 --- a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp @@ -209,6 +209,26 @@ void NetworkWidget::ConnectWidgets() { connect(m_dump_format_combo, &QComboBox::currentIndexChanged, this, &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) { 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) { Config::SetBaseOrCurrent(Config::MAIN_NETWORK_DUMP_BBA, state == Qt::Checked); }); +#endif connect(m_open_dump_folder, &QPushButton::clicked, [] { const std::string location = File::GetUserPath(D_DUMPSSL_IDX); const QUrl url = QUrl::fromLocalFile(QString::fromStdString(location)); |
