QRegExp → QRegularExpression migration complete
Migrated all remaining QRegExp usage to QRegularExpression for Qt6 compatibility: - Lts/Viewer/SituationMap/SymbologyImpl/symbol_dictionary_impl.cpp - Changed helper functions to use QRegularExpression::match().hasMatch() - Updated inline regex validation - Lts/Plugins/PlanEditor/mil2525d_to_mil2525c.cpp - Fixed m_sidcQuery.exactMatch() → match().hasMatch() - Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp - Video file pattern matching migrated - Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.cpp - NMEA message parsing with QRegularExpression - Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp - AES data handler regex patterns migrated - Lts/Services/AudioVideoManagement/stream_name_mapping.* - Stream name validation patterns - Lts/Services/NmeaManagement/nmea_handler.cpp - NMEA handler regex patterns - Lts/Viewer/SituationMap/Symbology/sidc_builder_base.cpp, sidc_codec.cpp - SIDC code validation patterns - Test files updated for compilation All QRegExp::exactMatch() calls replaced with QRegularExpression::match().hasMatch() All QRegExp::cap(n) calls replaced with QRegularExpressionMatch::captured(n) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
793c9f8b81
commit
f15f342a47
15 files changed
+43
-336
No files matched your search
+5
-3
@@ -14,6 +14,7 @@
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <QtGlobal>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QRegularExpressionMatch>
|
||||
|
||||
namespace
|
||||
{
|
||||
@@ -77,9 +78,10 @@ QString StreamNameMapping::internalName(const QString &displayName)
|
||||
|
||||
QString StreamNameMapping::displayName(const QString &internalName) const
|
||||
{
|
||||
bool matched = m_extractor.exactMatch(internalName);
|
||||
const QString effectiveStreamName = matched ? m_extractor.cap(1) : internalName;
|
||||
const QString sourceSpecifier = matched ? m_extractor.cap(2) : QString();
|
||||
const QRegularExpressionMatch match = m_extractor.match(internalName);
|
||||
const bool matched = match.hasMatch();
|
||||
const QString effectiveStreamName = matched ? match.captured(1) : internalName;
|
||||
const QString sourceSpecifier = matched ? match.captured(2) : QString();
|
||||
|
||||
const auto &found = m_internalToDisplay.find(effectiveStreamName);
|
||||
if (found == m_internalToDisplay.end())
|
||||
|
||||
Reference in new issue
Block a user