Merge pull request #44140 from nirvn/regexp_more_more_more

[qt6] Easy src/core QRegExp migrations
qgis · Jul 13, 2021 · 5762fe3 · 5762fe3
2 parents 6db6de3 + 60f947d
commit 5762fe3
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 26 deletions.
diff --git a/src/core/geometry/qgsrectangle.cpp b/src/core/geometry/qgsrectangle.cpp
@@ -15,14 +15,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <algorithm>
-#include <cmath>
-#include <limits>
-#include <QString>
-#include <QTextStream>
-#include <QTransform>
-#include <QRegExp>
-
 #include "qgsgeometry.h"
 #include "qgspointxy.h"
 #include "qgsrectangle.h"
@@ -31,6 +23,14 @@
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 
+#include <QString>
+#include <QTextStream>
+#include <QTransform>
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+
 QgsRectangle QgsRectangle::fromWkt( const QString &wkt )
 {
   QgsGeometry geom = QgsGeometry::fromWkt( wkt );

diff --git a/src/core/qgscolorscheme.cpp b/src/core/qgscolorscheme.cpp
@@ -24,6 +24,7 @@
 #include "qgssettings.h"
 
 #include <QDir>
+#include <QRegularExpression>
 #include <QTextStream>
 
 bool QgsColorScheme::setColors( const QgsNamedColorList &colors, const QString &context, const QColor &baseColor )
@@ -305,10 +306,11 @@ QgsUserColorScheme::QgsUserColorScheme( const QString &filename )
     }
     if ( !in.atEnd() )
     {
-      QRegExp rx( "Name:\\s*(\\S.*)$" );
-      if ( rx.indexIn( line ) != -1 )
+      const QRegularExpression rx( "Name:\\s*(\\S.*)$" );
+      const QRegularExpressionMatch match = rx.match( line );
+      if ( match.hasMatch() )
       {
-        mName = rx.cap( 1 );
+        mName = match.captured( 1 );
       }
     }
   }

diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp
@@ -23,7 +23,7 @@
 #include "qgsapplication.h"
 
 #include <QStringList>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QUrl>
 #include <QUrlQuery>
 
@@ -219,8 +219,8 @@ QgsDataSourceUri::QgsDataSourceUri( const QString &u )
 
 QString QgsDataSourceUri::removePassword( const QString &aUri )
 {
-  QRegExp regexp;
-  regexp.setMinimal( true );
+  QRegularExpression regexp;
+  regexp.setPatternOptions( QRegularExpression::InvertedGreedinessOption );
   QString safeName( aUri );
   if ( aUri.contains( QLatin1String( " password=" ) ) )
   {

diff --git a/src/core/qgserror.cpp b/src/core/qgserror.cpp
@@ -20,7 +20,7 @@
 #include "qgserror.h"
 #include "qgslogger.h"
 
-#include <QRegExp>
+#include <QRegularExpression>
 
 QgsErrorMessage::QgsErrorMessage( const QString &message, const QString &tag, const QString &file, const QString &function, int line )
   : mMessage( message )
@@ -61,7 +61,7 @@ QString QgsError::message( QgsErrorMessage::Format format ) const
   QString remote = QStringLiteral( QGS_GIT_REMOTE_URL );
   if ( !hash.isEmpty() && !remote.isEmpty() && remote.contains( QLatin1String( "github.com" ) ) )
   {
-    QString path = remote.remove( QRegExp( ".*github.com[:/]" ) ).remove( QStringLiteral( ".git" ) );
+    QString path = remote.remove( QRegularExpression( ".*github.com[:/]" ) ).remove( QStringLiteral( ".git" ) );
     srcUrl = "https://github.com/" + path + "/blob/" + hash;
   }
 #endif

diff --git a/src/core/qgsinterval.cpp b/src/core/qgsinterval.cpp
@@ -14,12 +14,14 @@
  ***************************************************************************/
 
 #include "qgsinterval.h"
+
 #include <QString>
 #include <QStringList>
 #include <QMap>
 #include <QObject>
 #include <QDebug>
 #include <QDateTime>
+#include <QRegularExpression>
 
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
@@ -209,14 +211,15 @@ void QgsInterval::setSeconds( double seconds )
 QgsInterval QgsInterval::fromString( const QString &string )
 {
   double seconds = 0;
-  QRegExp rx( "([-+]?\\d*\\.?\\d+\\s+\\S+)", Qt::CaseInsensitive );
+  const thread_local QRegularExpression rx( "([-+]?\\d*\\.?\\d+\\s+\\S+)", QRegularExpression::CaseInsensitiveOption );
   QStringList list;
   int pos = 0;
-
-  while ( ( pos = rx.indexIn( string, pos ) ) != -1 )
+  QRegularExpressionMatch match = rx.match( string );
+  while ( match.hasMatch() )
   {
-    list << rx.cap( 1 );
-    pos += rx.matchedLength();
+    list << match.captured( 1 );
+    pos = match.capturedStart() + match.capturedLength();
+    match = rx.match( string, pos );
   }
 
   QMap<int, QStringList> map;
@@ -231,7 +234,8 @@ QgsInterval QgsInterval::fromString( const QString &string )
   const auto constList = list;
   for ( const QString &match : constList )
   {
-    QStringList split = match.split( QRegExp( "\\s+" ) );
+    const thread_local QRegularExpression splitRx( "\\s+" );
+    QStringList split = match.split( splitRx );
     bool ok;
     double value = split.at( 0 ).toDouble( &ok );
     if ( !ok )

diff --git a/src/core/qgsmessageoutput.cpp b/src/core/qgsmessageoutput.cpp
@@ -17,7 +17,7 @@
 #include "qgslogger.h"
 #include "qgsmessagelog.h"
 
-#include <QRegExp>
+#include <QRegularExpression>
 
 static QgsMessageOutput *messageOutputConsole_()
 {
@@ -66,7 +66,7 @@ void QgsMessageOutputConsole::showMessage( bool )
   {
     mMessage.replace( QLatin1String( "<br>" ), QLatin1String( "\n" ) );
     mMessage.replace( QLatin1String( "&nbsp;" ), QLatin1String( " " ) );
-    mMessage.replace( QRegExp( "</?[^>]+>" ), QString() );
+    mMessage.replace( QRegularExpression( "</?[^>]+>" ), QString() );
   }
   QgsMessageLog::logMessage( mMessage, mTitle.isNull() ? QObject::tr( "Console" ) : mTitle );
   emit destroyed();

diff --git a/src/core/qgssqlstatement.cpp b/src/core/qgssqlstatement.cpp
@@ -17,6 +17,8 @@
 #include "qgssqlstatement.h"
 #include "qgis.h"
 
+#include <QRegularExpression>
+
 #include <cmath>
 #include <limits>
 
@@ -89,8 +91,8 @@ QString QgsSQLStatement::quotedIdentifierIfNeeded( const QString &name )
       return quotedIdentifier( name );
     }
   }
-  static const QRegExp IDENTIFIER_RE( "^[A-Za-z_\x80-\xff][A-Za-z0-9_\x80-\xff]*$" );
-  return IDENTIFIER_RE.exactMatch( name ) ? name : quotedIdentifier( name );
+  const thread_local QRegularExpression IDENTIFIER_RE( "^[A-Za-z_\x80-\xff][A-Za-z0-9_\x80-\xff]*$" );
+  return IDENTIFIER_RE.match( name ).hasMatch() ? name : quotedIdentifier( name );
 }
 
 QString QgsSQLStatement::stripQuotedIdentifier( QString text )