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

QbsPM:QmakePM: Replace QRegExp by QRegularExpression

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: If561553a6030f8eaedbafbc1b4531a6b63c4aa36
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2020-07-14 11:20:22 +02:00
parent 9fa1286faf
commit 9783761df3
6 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.cpp
View File

@@ -33,7 +33,7 @@
#include <QStandardItem>
#include <QDebug>
#include <QRegExp>
#include <QRegularExpression>
namespace QmakeProjectManager {
namespace Internal {
@@ -53,7 +53,7 @@ public:
private:
void appendClass(const QString &);
QRegExp m_validator;
QRegularExpression m_validator;
const QString m_newClassPlaceHolder;
};
@@ -75,7 +75,7 @@ void ClassModel::appendClass(const QString &c)
bool ClassModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (role == Qt::EditRole && !m_validator.exactMatch(value.toString()))
if (role == Qt::EditRole && !m_validator.match(value.toString()).hasMatch())
return false;
return QStandardItemModel::setData(index, value, role);
}

4
src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
View File

@@ -36,12 +36,12 @@
#include <QFileInfo>
#include <QDir>
#include <QRegExp>
#include <QRegularExpression>
#include <QSet>
static QString headerGuard(const QString &header)
{
return header.toUpper().replace(QRegExp(QLatin1String("[^A-Z0-9]+")), QLatin1String("_"));
return header.toUpper().replace(QRegularExpression("[^A-Z0-9]+"), QString("_"));
}
namespace QmakeProjectManager {