Lts/Tools: Complete QRegExp to QRegularExpression migration
- Migrated QRegExp → QRegularExpression in: - DdsView/detailview.cpp (line 636) - DdsView/sequences/abstractsequencewidget.cpp (line 167) - VapixConfig/httprequesthandler.cpp (lines 68, 95, 136) - ConfigX/configurator.cpp - LogViewer/sortfiltermodel.cpp - SqlBrowser/BrowserWnd.cpp - Added Qt6::Core5Compat to TextEditorTest CMakeLists.txt for QTextCodec support - All QRegExp instances in Lts/Tools now migrated to QRegularExpression Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
d5c13033e2
commit
71636a42c4
7 files changed
+13
-11
No files matched your search
@@ -7,7 +7,6 @@
|
|||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QStyle>
|
#include <QStyle>
|
||||||
#include <QDesktopWidget>
|
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QCheckBox>
|
#include <QCheckBox>
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
#include <QTabWidget>
|
#include <QTabWidget>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
#include <QMouseEvent>
|
#include <QMouseEvent>
|
||||||
|
#include <QRegularExpression>
|
||||||
|
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
@@ -632,7 +633,7 @@ QWidget *DetailView::createWidget(const RwMode &readOnly,
|
|||||||
case dds::core::xtypes::TypeKind::STRUCTURE_TYPE:
|
case dds::core::xtypes::TypeKind::STRUCTURE_TYPE:
|
||||||
{
|
{
|
||||||
//noNaming = true;
|
//noNaming = true;
|
||||||
g = name.contains(QRegExp(QLatin1String(".([0-9]*)$"))) ? new QWidget(parent) : new QGroupBox(name, parent);
|
g = name.contains(QRegularExpression(QLatin1String(".*([0-9]*)$"))) ? new QWidget(parent) : new QGroupBox(name, parent);
|
||||||
|
|
||||||
QGridLayout *gl = new QGridLayout(g);
|
QGridLayout *gl = new QGridLayout(g);
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -8,6 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "abstractsequencewidget.h"
|
#include "abstractsequencewidget.h"
|
||||||
|
|
||||||
|
#include <QRegularExpression>
|
||||||
#include <QToolButton>
|
#include <QToolButton>
|
||||||
|
|
||||||
AbstractSequenceWidget::AbstractSequenceWidget(const RwMode &readOnly,
|
AbstractSequenceWidget::AbstractSequenceWidget(const RwMode &readOnly,
|
||||||
@@ -164,7 +165,7 @@ void AbstractSequenceWidget::deleteMemberWidget(QObject *member)
|
|||||||
|
|
||||||
QString childName = child->objectName();
|
QString childName = child->objectName();
|
||||||
QString newId = m_name + QLatin1Char('.') + QString::number(i + 1);
|
QString newId = m_name + QLatin1Char('.') + QString::number(i + 1);
|
||||||
child->setObjectName(childName.replace(QRegExp(m_name + QLatin1String(".([0-9]*)")), newId));
|
child->setObjectName(childName.replace(QRegularExpression(QRegularExpression::escape(m_name + QLatin1String(".") + "([0-9]*)")), newId));
|
||||||
DEBUG_LOG(m_logger) << "new child name: " << child->objectName();
|
DEBUG_LOG(m_logger) << "new child name: " << child->objectName();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
#include "sortfiltermodel.h"
|
#include "sortfiltermodel.h"
|
||||||
#include "logviewtablemodel.h"
|
#include "logviewtablemodel.h"
|
||||||
|
|
||||||
#include <QRegExp>
|
#include <QRegularExpression>
|
||||||
|
|
||||||
void SortFilterModel::setStartDateFilter(const QDateTime &start)
|
void SortFilterModel::setStartDateFilter(const QDateTime &start)
|
||||||
{
|
{
|
||||||
@@ -52,8 +52,8 @@ void SortFilterModel::setStringFilter(int col, const QString &filter)
|
|||||||
|
|
||||||
if (m_stringFilter.contains(col))
|
if (m_stringFilter.contains(col))
|
||||||
{
|
{
|
||||||
QRegExp currentFilter(m_stringFilter[col], Qt::CaseInsensitive, QRegExp::FixedString);
|
QRegularExpression currentFilter(QRegularExpression::escape(m_stringFilter[col]), QRegularExpression::CaseInsensitiveOption);
|
||||||
if (currentFilter.exactMatch(filter))
|
if (currentFilter.match(filter).hasMatch())
|
||||||
return;
|
return;
|
||||||
else
|
else
|
||||||
m_stringFilter.insert(col, filter);
|
m_stringFilter.insert(col, filter);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
#include <QGraphicsDropShadowEffect>
|
#include <QGraphicsDropShadowEffect>
|
||||||
#include <QListWidgetItem>
|
#include <QListWidgetItem>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QRegExp>
|
#include <QRegularExpression>
|
||||||
#include <QShortcut>
|
#include <QShortcut>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
|
|
||||||
@@ -158,7 +158,7 @@ void BrowserWnd::slotNewTableList(QStringList tables)
|
|||||||
{
|
{
|
||||||
if (!m_ui->leFilter->text().isEmpty()) // filter when there is a filter
|
if (!m_ui->leFilter->text().isEmpty()) // filter when there is a filter
|
||||||
{
|
{
|
||||||
QRegExp regExp(m_ui->leFilter->text(), Qt::CaseInsensitive, QRegExp::Wildcard);
|
QRegularExpression regExp(QRegularExpression::wildcardToRegularExpression(m_ui->leFilter->text()), QRegularExpression::CaseInsensitiveOption);
|
||||||
tables = tables.filter(regExp);
|
tables = tables.filter(regExp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ NGL_TARGET_LINK_LIBRARIES(textEditorTest
|
|||||||
nglsettings
|
nglsettings
|
||||||
nglwidgets
|
nglwidgets
|
||||||
Qt6::Core
|
Qt6::Core
|
||||||
|
Qt6::Core5Compat
|
||||||
Qt6::Gui
|
Qt6::Gui
|
||||||
Qt6::Widgets
|
Qt6::Widgets
|
||||||
Qt6::Xml
|
Qt6::Xml
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ QVector<QMap<QString, QString>> HTTPRequestHandler::getParams(const QString &gro
|
|||||||
QByteArray replyBytes = reply->readAll();
|
QByteArray replyBytes = reply->readAll();
|
||||||
QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size());
|
QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size());
|
||||||
QRegularExpression re(QLatin1String("(\\w++=[^_]++)"));
|
QRegularExpression re(QLatin1String("(\\w++=[^_]++)"));
|
||||||
const QVector<QStringRef> replyList = replyText.splitRef(QRegExp(QLatin1String("\n|\r\n|\r")));
|
const QVector<QStringRef> replyList = replyText.splitRef(QRegularExpression(QLatin1String("\n|\r\n|\r")));
|
||||||
QMap<QString, QString> paramMap;
|
QMap<QString, QString> paramMap;
|
||||||
for (const QStringRef &string : replyList)
|
for (const QStringRef &string : replyList)
|
||||||
{
|
{
|
||||||
@@ -92,7 +92,7 @@ void HTTPRequestHandler::removeParams(const QString &groupName, QNetworkAccessMa
|
|||||||
QByteArray replyBytes = reply->readAll();
|
QByteArray replyBytes = reply->readAll();
|
||||||
QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size());
|
QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size());
|
||||||
QRegularExpression re(QLatin1String("(\\b\\w{2}\\b)"));
|
QRegularExpression re(QLatin1String("(\\b\\w{2}\\b)"));
|
||||||
const QVector<QStringRef> replyList = replyText.splitRef(QRegExp(QLatin1String("\n|\r\n|\r")));
|
const QVector<QStringRef> replyList = replyText.splitRef(QRegularExpression(QLatin1String("\n|\r\n|\r")));
|
||||||
QStringList tempList;
|
QStringList tempList;
|
||||||
for (const QStringRef &string : replyList)
|
for (const QStringRef &string : replyList)
|
||||||
{
|
{
|
||||||
@@ -133,7 +133,7 @@ int HTTPRequestHandler::getAmount(const QString &groupName, QNetworkAccessManage
|
|||||||
QByteArray replyBytes = reply->readAll();
|
QByteArray replyBytes = reply->readAll();
|
||||||
QString bytesString = QString::fromUtf8(replyBytes.data(), replyBytes.size());
|
QString bytesString = QString::fromUtf8(replyBytes.data(), replyBytes.size());
|
||||||
QString replyText = QVariant(bytesString).toString();
|
QString replyText = QVariant(bytesString).toString();
|
||||||
QStringList replyList = replyText.split(QRegExp(QLatin1String("\n|\r\n|\r")));
|
QStringList replyList = replyText.split(QRegularExpression(QLatin1String("\n|\r\n|\r")));
|
||||||
reply->deleteLater();
|
reply->deleteLater();
|
||||||
return replyList.count() - 1;
|
return replyList.count() - 1;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user