Q_GLOBAL_STATIC for QgsDataProvider

qgis · Nov 2, 2019 · a502875 · a502875
1 parent 2b20c61
commit a502875
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 16 deletions.
diff --git a/python/core/__init__.py.in b/python/core/__init__.py.in
@@ -38,6 +38,7 @@ from .additions.qgssettings import _qgssettings_enum_value, _qgssettings_set_enu
 from .additions.qgstaskwrapper import QgsTaskWrapper
 from .additions.readwritecontextentercategory import ReadWriteContextEnterCategory
 from .additions.validitycheck import check
+from .additions import qgsdataprovider
 
 # Injections into classes
 QgsFeature.__geo_interface__ = property(mapping_feature)

diff --git a/python/core/additions/qgsdataprovider.py b/python/core/additions/qgsdataprovider.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    qgsdataprovider.py
+    ---------------------
+    Date                 : November 2019
+    Copyright            : (C) 2019 by Matthias Kuhn
+    Email                : matthias@opengis.ch
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+
+from qgis.core import QgsDataProvider
+
+# Monkey patch static const "QgsDataProvider.SUBLAYER_SEPARATOR" which was removed for QGIS 3.12
+QgsDataProvider.SUBLAYER_SEPARATOR = QgsDataProvider.sublayerSeparator()
diff --git a/python/core/auto_generated/qgsdataprovider.sip.in b/python/core/auto_generated/qgsdataprovider.sip.in
@@ -170,8 +170,6 @@ it knows about in some way before it hands them off to the provider.
 .. seealso:: SUBLAYER_SEPARATOR
 %End
 
-    static QString SUBLAYER_SEPARATOR;
-
     virtual QStringList subLayerStyles() const;
 %Docstring
 Sub-layer styles for each sub-layer handled by this provider,
@@ -392,6 +390,8 @@ Returns ``True`` if metadata was successfully written to the data provider.
 
 
 
+    static QString sublayerSeparator();
+
   signals:
 
     void fullExtentCalculated();

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4833,7 +4833,7 @@ QString QgisApp::crsAndFormatAdjustedLayerUri( const QString &uri, const QString
 
 static QStringList splitSubLayerDef( const QString &subLayerDef )
 {
-  return subLayerDef.split( QgsDataProvider::SUBLAYER_SEPARATOR );
+  return subLayerDef.split( QgsDataProvider::sublayerSeparator() );
 }
 
 static void setupVectorLayer( const QString &vectorLayerPath,
@@ -5267,7 +5267,7 @@ QList< QgsMapLayer * > QgisApp::askUserForGDALSublayers( QgsRasterLayer *layer )
     else
     {
       // remove driver name and file name
-      name.remove( name.split( QgsDataProvider::SUBLAYER_SEPARATOR )[0] );
+      name.remove( name.split( QgsDataProvider::sublayerSeparator() )[0] );
       name.remove( path );
     }
     // remove any : or " left over

diff --git a/src/core/providers/gdal/qgsgdaldataitems.cpp b/src/core/providers/gdal/qgsgdaldataitems.cpp
@@ -90,7 +90,7 @@ QVector<QgsDataItem *> QgsGdalLayerItem::createChildren()
       else
       {
         // remove driver name and file name and initial ':'
-        name.remove( name.split( QgsDataProvider::SUBLAYER_SEPARATOR )[0] + ':' );
+        name.remove( name.split( QgsDataProvider::sublayerSeparator() )[0] + ':' );
         name.remove( mPath );
       }
       // remove any : or " left over

diff --git a/src/core/providers/ogr/qgsogrdataitems.cpp b/src/core/providers/ogr/qgsogrdataitems.cpp
@@ -122,7 +122,7 @@ QList<QgsOgrDbLayerInfo *> QgsOgrLayerItem::subLayers( const QString &path, cons
     int prevIdx = -1;
     for ( const QString &descriptor : subLayersList )
     {
-      QStringList pieces = descriptor.split( QgsDataProvider::SUBLAYER_SEPARATOR );
+      QStringList pieces = descriptor.split( QgsDataProvider::sublayerSeparator() );
       int idx = pieces[0].toInt();
       subLayersMap.insert( idx, pieces );
       if ( pieces.count() >= 4 && idx != prevIdx )

diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -836,7 +836,7 @@ void QgsOgrProvider::addSubLayerDetailsToSubLayerList( int i, QgsOgrLayer *layer
                         << geometryColumnName
                         << longDescription;
 
-    mSubLayerList << parts.join( QgsDataProvider::SUBLAYER_SEPARATOR );
+    mSubLayerList << parts.join( sublayerSeparator() );
   }
   else
   {
@@ -908,7 +908,7 @@ void QgsOgrProvider::addSubLayerDetailsToSubLayerList( int i, QgsOgrLayer *layer
                           << geometryColumnName
                           << longDescription;
 
-      QString sl = parts.join( QgsDataProvider::SUBLAYER_SEPARATOR );
+      QString sl = parts.join( sublayerSeparator() );
       QgsDebugMsg( "sub layer: " + sl );
       mSubLayerList << sl;
     }

diff --git a/src/core/qgsdataprovider.cpp b/src/core/qgsdataprovider.cpp
@@ -16,7 +16,7 @@
 #include <QMutexLocker>
 #include "qgsdataprovider.h"
 
-QString QgsDataProvider::SUBLAYER_SEPARATOR = QString( "!!::!!" );
+#define SUBLAYER_SEPARATOR QStringLiteral( "!!::!!" )
 
 QgsDataProvider::QgsDataProvider( const QString &uri, const QgsDataProvider::ProviderOptions &providerOptions )
   : mDataSourceURI( uri ),
@@ -65,3 +65,8 @@ void QgsDataProvider::setTransformContext( const QgsCoordinateTransformContext &
   QMutexLocker locker( &mOptionsMutex );
   mOptions.transformContext = value;
 }
+
+QString QgsDataProvider::sublayerSeparator()
+{
+  return SUBLAYER_SEPARATOR;
+}
diff --git a/src/core/qgsdataprovider.h b/src/core/qgsdataprovider.h
@@ -239,13 +239,6 @@ class CORE_EXPORT QgsDataProvider : public QObject
       return QStringList();  // Empty
     }
 
-    /**
-     * String sequence used for separating components of sublayers strings.
-     * \see subLayers()
-     * \since QGIS 3.0
-     */
-    static QString SUBLAYER_SEPARATOR;
-
     /**
      * Sub-layer styles for each sub-layer handled by this provider,
      * in order from bottom to top
@@ -546,6 +539,8 @@ class CORE_EXPORT QgsDataProvider : public QObject
      */
     virtual void setTransformContext( const QgsCoordinateTransformContext &transformContext ) SIP_SKIP;
 
+    static QString sublayerSeparator();
+
   signals:
 
     /**