Move isSaveAndLoadStyleToDatabaseSupported and isDeleteStyleFromDatab…

…aseSupported to QgsDataProvider
qgis · Sep 18, 2023 · ee35734 · ee35734
1 parent 0a1dd0a
commit ee35734
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 38 deletions.
diff --git a/python/core/auto_generated/providers/qgsdataprovider.sip.in b/python/core/auto_generated/providers/qgsdataprovider.sip.in
@@ -472,6 +472,18 @@ String sequence used for separating components of sublayers strings.
 .. seealso:: :py:func:`subLayers`
 
 .. versionadded:: 3.12
+%End
+
+    virtual bool isSaveAndLoadStyleToDatabaseSupported() const;
+%Docstring
+It returns ``False`` by default.
+Must be implemented by providers that support saving and loading styles to db returning ``True``
+%End
+
+    virtual bool isDeleteStyleFromDatabaseSupported() const;
+%Docstring
+It returns ``False`` by default.
+Must be implemented by providers that support delete styles from db returning ``True``
 %End
 
   signals:

diff --git a/python/core/auto_generated/vector/qgsvectordataprovider.sip.in b/python/core/auto_generated/vector/qgsvectordataprovider.sip.in
@@ -536,18 +536,6 @@ Clear recorded errors
     QStringList errors() const;
 %Docstring
 Gets recorded errors
-%End
-
-    virtual bool isSaveAndLoadStyleToDatabaseSupported() const;
-%Docstring
-It returns ``False`` by default.
-Must be implemented by providers that support saving and loading styles to db returning ``True``
-%End
-
-    virtual bool isDeleteStyleFromDatabaseSupported() const;
-%Docstring
-It returns ``False`` by default.
-Must be implemented by providers that support delete styles from db returning ``True``
 %End
 
     virtual QgsFeatureRenderer *createRenderer( const QVariantMap &configuration = QVariantMap() ) const /Factory/;

diff --git a/src/core/providers/qgsdataprovider.cpp b/src/core/providers/qgsdataprovider.cpp
@@ -141,3 +141,17 @@ QString QgsDataProvider::sublayerSeparator()
 {
   return SUBLAYER_SEPARATOR;
 }
+
+bool QgsDataProvider::isSaveAndLoadStyleToDatabaseSupported() const
+{
+  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
+  return false;
+}
+
+bool QgsDataProvider::isDeleteStyleFromDatabaseSupported() const
+{
+  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
+
+  return false;
+}
+
diff --git a/src/core/providers/qgsdataprovider.h b/src/core/providers/qgsdataprovider.h
@@ -638,6 +638,18 @@ class CORE_EXPORT QgsDataProvider : public QObject
      */
     static QString sublayerSeparator();
 
+    /**
+     * It returns FALSE by default.
+     * Must be implemented by providers that support saving and loading styles to db returning TRUE
+     */
+    virtual bool isSaveAndLoadStyleToDatabaseSupported() const;
+
+    /**
+     * It returns FALSE by default.
+     * Must be implemented by providers that support delete styles from db returning TRUE
+     */
+    virtual bool isDeleteStyleFromDatabaseSupported() const;
+
   signals:
 
     /**

diff --git a/src/core/vector/qgsvectordataprovider.cpp b/src/core/vector/qgsvectordataprovider.cpp
@@ -850,20 +850,6 @@ QStringList QgsVectorDataProvider::errors() const
   return mErrors;
 }
 
-bool QgsVectorDataProvider::isSaveAndLoadStyleToDatabaseSupported() const
-{
-  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
-
-  return false;
-}
-
-bool QgsVectorDataProvider::isDeleteStyleFromDatabaseSupported() const
-{
-  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
-
-  return false;
-}
-
 QgsFeatureRenderer *QgsVectorDataProvider::createRenderer( const QVariantMap & ) const
 {
   QGIS_PROTECT_QOBJECT_THREAD_ACCESS

diff --git a/src/core/vector/qgsvectordataprovider.h b/src/core/vector/qgsvectordataprovider.h
@@ -527,18 +527,6 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
      */
     QStringList errors() const;
 
-    /**
-     * It returns FALSE by default.
-     * Must be implemented by providers that support saving and loading styles to db returning TRUE
-     */
-    virtual bool isSaveAndLoadStyleToDatabaseSupported() const;
-
-    /**
-     * It returns FALSE by default.
-     * Must be implemented by providers that support delete styles from db returning TRUE
-     */
-    virtual bool isDeleteStyleFromDatabaseSupported() const;
-
     /**
      * Creates a new vector layer feature renderer, using provider backend specific information.
      *