AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QRegExp from the bootstrap library

Browse Source 
All it's uses have been replaces with QRegularExpression.

Change-Id: I5bcdfdd8a39dad6d1288f18f1b24d2eea9e028d2
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
This commit is contained in:
Lars Knoll 2020-03-26 21:10:20 +01:00
parent 660b38bb2c
commit 56a7984a90
6 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qmake/generators/makefile.cpp
View File

@ -41,6 +41,7 @@
#include <qdebug.h>
#include <qbuffer.h>
#include <qdatetime.h>
#include <qregexp.h>
#if defined(Q_OS_UNIX)
#include <unistd.h>

4
src/corelib/global/qconfig-bootstrapped.h
View File

@ -66,6 +66,10 @@
#define QT_NO_USING_NAMESPACE
#define QT_NO_DEPRECATED
#ifndef QT_BUILD_QMAKE
#define QT_NO_REGEXP
#endif
// Keep feature-test macros in alphabetic order by feature name:
#define QT_FEATURE_alloca 1
#define QT_FEATURE_alloca_h -1

28
src/corelib/io/qdiriterator.cpp
View File

@ -93,9 +93,6 @@
#include "qdir_p.h"
#include "qabstractfileengine_p.h"
#ifdef QT_BOOTSTRAPPED
#include <QtCore/qregexp.h>
#endif
#include <QtCore/qset.h>
#include <QtCore/qstack.h>
#include <QtCore/qvariant.h>
@ -144,10 +141,7 @@ public:
const QDir::Filters filters;
const QDirIterator::IteratorFlags iteratorFlags;
#if defined(QT_BOOTSTRAPPED)
// ### Qt6: Get rid of this once we don't bootstrap qmake anymore
QVector<QRegExp> nameRegExps;
#elif QT_CONFIG(regularexpression)
#if QT_CONFIG(regularexpression)
QVector<QRegularExpression> nameRegExps;
#endif
@ -173,15 +167,7 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QFileSystemEntry &entry, const QS
, filters(QDir::NoFilter == filters ? QDir::AllEntries : filters)
, iteratorFlags(flags)
{
#if defined(QT_BOOTSTRAPPED)
nameRegExps.reserve(nameFilters.size());
for (const auto &filter : nameFilters) {
nameRegExps.append(
QRegExp(filter,
(filters & QDir::CaseSensitive) ? Qt::CaseSensitive : Qt::CaseInsensitive,
QRegExp::Wildcard));
}
#elif QT_CONFIG(regularexpression)
#if QT_CONFIG(regularexpression)
nameRegExps.reserve(nameFilters.size());
for (const auto &filter : nameFilters) {
QString re = QRegularExpression::wildcardToRegularExpression(filter);
@ -352,23 +338,15 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf
return false;
// name filter
#if QT_CONFIG(regularexpression) || defined(QT_BOOTSTRAPPED)
#if QT_CONFIG(regularexpression)
// Pass all entries through name filters, except dirs if the AllDirs
if (!nameFilters.isEmpty() && !((filters & QDir::AllDirs) && fi.isDir())) {
bool matched = false;
for (const auto &re : nameRegExps) {
#if defined(QT_BOOTSTRAPPED)
QRegExp copy = re;
if (copy.exactMatch(fileName)) {
matched = true;
break;
}
#else
if (re.match(fileName).hasMatch()) {
matched = true;
break;
}
#endif
}
if (!matched)
return false;

1
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -103,7 +103,6 @@ qt_add_module(Bootstrap
../../corelib/text/qbytearraymatcher.cpp
../../corelib/text/qlocale.cpp
../../corelib/text/qlocale_tools.cpp
../../corelib/text/qregexp.cpp
../../corelib/text/qregularexpression.cpp
../../corelib/text/qstring.cpp
../../corelib/text/qstring_compat.cpp

1
src/tools/bootstrap/CMakeLists.txt
View File

@ -104,7 +104,6 @@ qt_extend_target(Bootstrap
../../corelib/text/qbytearraymatcher.cpp
../../corelib/text/qlocale.cpp
../../corelib/text/qlocale_tools.cpp
../../corelib/text/qregexp.cpp
../../corelib/text/qregularexpression.cpp
../../corelib/text/qstring.cpp
../../corelib/text/qstring_compat.cpp

1
src/tools/bootstrap/bootstrap.pro
View File

@ -90,7 +90,6 @@ SOURCES += \
../../corelib/text/qbytearraymatcher.cpp \
../../corelib/text/qlocale.cpp \
../../corelib/text/qlocale_tools.cpp \
../../corelib/text/qregexp.cpp \
../../corelib/text/qregularexpression.cpp \
../../corelib/text/qstring.cpp \
../../corelib/text/qstringbuilder.cpp \