feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help:iOS: Replace QRegExp by QRegularExpression

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: Ie63ac88e3afdc39db0d9ead4b058efbaec402001
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2020-07-13 12:59:26 +02:00
parent 5e8e1a36ec
commit b9c5d63c27
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/helpplugin.cpp
View File

@@ -80,7 +80,7 @@
#include <QTimer> #include <QTimer>
#include <QTranslator> #include <QTranslator>
#include <qplugin.h> #include <qplugin.h>
#include <QRegExp> #include <QRegularExpression>
#include <QAction> #include <QAction>
#include <QComboBox> #include <QComboBox>
@@ -322,12 +322,12 @@ void HelpPluginPrivate::resetFilter()
{ {
const QString &filterInternal = QString::fromLatin1("Qt Creator %1.%2.%3") const QString &filterInternal = QString::fromLatin1("Qt Creator %1.%2.%3")
.arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR).arg(IDE_VERSION_RELEASE); .arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR).arg(IDE_VERSION_RELEASE);
QRegExp filterRegExp("Qt Creator \\d*\\.\\d*\\.\\d*"); const QRegularExpression filterRegExp("^Qt Creator \\d*\\.\\d*\\.\\d*$");
QHelpEngineCore *engine = &LocalHelpManager::helpEngine(); QHelpEngineCore *engine = &LocalHelpManager::helpEngine();
const QStringList &filters = engine->customFilters(); const QStringList &filters = engine->customFilters();
foreach (const QString &filter, filters) { for (const QString &filter : filters) {
if (filterRegExp.exactMatch(filter) && filter != filterInternal) if (filterRegExp.match(filter).hasMatch() && filter != filterInternal)
engine->removeCustomFilter(filter); engine->removeCustomFilter(filter);
} }

18
src/plugins/ios/iosrunner.cpp
View File

@@ -52,7 +52,7 @@
#include <QDateTime> #include <QDateTime>
#include <QDir> #include <QDir>
#include <QMessageBox> #include <QMessageBox>
#include <QRegExp> #include <QRegularExpression>
#include <QSettings> #include <QSettings>
#include <QTcpServer> #include <QTcpServer>
#include <QTime> #include <QTime>
@@ -275,11 +275,11 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output) void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output)
{ {
Q_UNUSED(handler) Q_UNUSED(handler)
QRegExp qmlPortRe("QML Debugger: Waiting for connection on port ([0-9]+)..."); QRegularExpression qmlPortRe("QML Debugger: Waiting for connection on port ([0-9]+)...");
int index = qmlPortRe.indexIn(output); const QRegularExpressionMatch match = qmlPortRe.match(output);
QString res(output); QString res(output);
if (index != -1 && m_qmlServerPort.isValid()) if (match.hasMatch() && m_qmlServerPort.isValid())
res.replace(qmlPortRe.cap(1), QString::number(m_qmlServerPort.number())); res.replace(match.captured(1), QString::number(m_qmlServerPort.number()));
appendMessage(output, StdOutFormat); appendMessage(output, StdOutFormat);
appOutput(res); appOutput(res);
} }
@@ -297,10 +297,10 @@ void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg)
TaskHub::addTask(DeploymentTask(Task::Error, message)); TaskHub::addTask(DeploymentTask(Task::Error, message));
res.replace(lockedErr, message); res.replace(lockedErr, message);
} }
QRegExp qmlPortRe("QML Debugger: Waiting for connection on port ([0-9]+)..."); QRegularExpression qmlPortRe("QML Debugger: Waiting for connection on port ([0-9]+)...");
int index = qmlPortRe.indexIn(msg); const QRegularExpressionMatch match = qmlPortRe.match(msg);
if (index != -1 && m_qmlServerPort.isValid()) if (match.hasMatch() && m_qmlServerPort.isValid())
res.replace(qmlPortRe.cap(1), QString::number(m_qmlServerPort.number())); res.replace(match.captured(1), QString::number(m_qmlServerPort.number()));
appendMessage(res, StdErrFormat); appendMessage(res, StdErrFormat);
errorMsg(res); errorMsg(res);