diff --git a/tests/qt_modeltest/tst_modeltest.cpp b/tests/qt_modeltest/tst_modeltest.cpp index 78a8e040c2f..76bddaf21cc 100644 --- a/tests/qt_modeltest/tst_modeltest.cpp +++ b/tests/qt_modeltest/tst_modeltest.cpp @@ -52,6 +52,7 @@ #include #include #include +#include #include "modeltest.h" #include "dynamictreemodel.h" @@ -116,7 +117,7 @@ void tst_ModelTest::stringListModel() model.setStringList( QStringList() << "a" << "e" << "plop" << "b" << "c" ); proxy.setDynamicSortFilter( true ); - proxy.setFilterRegExp( QRegExp( "[^b]" ) ); + proxy.setFilterRegularExpression( QRegularExpression( "[^b]" ) ); } void tst_ModelTest::treeWidgetModel() diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp index 706d714957e..977523d7bb4 100644 --- a/tests/src/app/testqgisappclipboard.cpp +++ b/tests/src/app/testqgisappclipboard.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include "qgisapp.h" #include "qgsapplication.h" @@ -179,9 +180,9 @@ void TestQgisAppClipboard::copyToText() // just test coordinates as integers - that's enough to verify that reprojection has occurred // and helps avoid rounding issues - QRegExp regex( "\\[([-\\d.]+),([-\\d.]+)\\]" ); - ( void )regex.indexIn( result ); - QStringList list = regex.capturedTexts(); + QRegularExpression regex( "\\[([-\\d.]+),([-\\d.]+)\\]" ); + QRegularExpressionMatch match = regex.match( result ); + QStringList list = match.capturedTexts(); QCOMPARE( list.count(), 3 ); int x = std::round( list.at( 1 ).toDouble() ); diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp index cc7fd100411..a0b352da6c1 100644 --- a/tests/src/core/testqgsogcutils.cpp +++ b/tests/src/core/testqgsogcutils.cpp @@ -23,6 +23,8 @@ #include "qgsapplication.h" #include "qgsvectorlayer.h" +#include + /** * \ingroup UnitTests * This is a unit test for OGC utilities @@ -103,9 +105,9 @@ void TestQgsOgcUtils::testGeometryFromGML() static bool compareElements( QDomElement &element1, QDomElement &element2 ) { QString tag1 = element1.tagName(); - tag1.replace( QRegExp( ".*:" ), QString() ); + tag1.replace( QRegularExpression( ".*:" ), QString() ); QString tag2 = element2.tagName(); - tag2.replace( QRegExp( ".*:" ), QString() ); + tag2.replace( QRegularExpression( ".*:" ), QString() ); if ( tag1 != tag2 ) { qDebug( "Different tag names: %s, %s", tag1.toLatin1().data(), tag2.toLatin1().data() ); diff --git a/tests/src/providers/testqgswcspublicservers.cpp b/tests/src/providers/testqgswcspublicservers.cpp index db4f6415a26..620b93db808 100644 --- a/tests/src/providers/testqgswcspublicservers.cpp +++ b/tests/src/providers/testqgswcspublicservers.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "qgsapplication.h" #include "qgsdatasourceuri.h" @@ -272,8 +273,8 @@ void TestQgsWcsPublicServers::test() QStringList myServerLog; myServerLog << "server:" + serverUrl; QString myServerDirName = serverUrl; - myServerDirName.replace( QRegExp( "[:/]+" ), QStringLiteral( "." ) ); - myServerDirName.remove( QRegExp( "\\.$" ) ); + myServerDirName.replace( QRegularExpression( "[:/]+" ), QStringLiteral( "." ) ); + myServerDirName.remove( QRegularExpression( "\\.$" ) ); QgsDebugMsg( "myServerDirName = " + myServerDirName ); QDir myServerDir( mCacheDir.absolutePath() + '/' + myServerDirName );