Rebase to current master

qgis · Apr 26, 2021 · 70ab21f · 70ab21f
1 parent 79393b6
commit 70ab21f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 54 deletions.
diff --git a/python/core/auto_generated/settings/qgssettingsentry.sip.in b/python/core/auto_generated/settings/qgssettingsentry.sip.in
@@ -86,7 +86,6 @@ Get settings entry key.
 The ``dynamicKeyParts`` argument specifies the list of dynamic parts of the settings key.
 %End
 
-<<<<<<< HEAD
     bool keyIsValid( const QString &key ) const;
 %Docstring
 Returns ``True`` if the provided key match the settings entry.
@@ -98,8 +97,6 @@ defined with the key "NewsFeed/%1/%2/content"
 The ``key`` to check
 %End
 
-=======
->>>>>>> 7b8aad6203 (Removed settings struct)
     QString definitionKey() const;
 %Docstring
 Returns settings entry defining key.
@@ -121,11 +118,7 @@ The ``dynamicKeyPart`` argument specifies the dynamic part of the settings key.
 
     bool exists( const QStringList &dynamicKeyPartList ) const;
 %Docstring
-<<<<<<< HEAD
 Returns ``True`` if the settings is contained in the underlying QSettings.
-=======
-Returns true if the settings is contained in the underlying QSettings.
->>>>>>> 7b8aad6203 (Removed settings struct)
 
 The ``dynamicKeyParts`` argument specifies the list of dynamic parts of the settings key.
 %End
@@ -306,19 +299,11 @@ The ``description`` argument specifies a description for the settings entry.
     bool setValue( const QString &value, const QString &dynamicKeyPart = QString() ) const;
 %Docstring
 Set settings value.
-<<<<<<< HEAD
 
 The ``value`` to set.
 The ``dynamicKeyPart`` argument specifies the dynamic part of the settings key.
 %End
 
-=======
-
-The ``value`` to set.
-The ``dynamicKeyPart`` argument specifies the dynamic part of the settings key.
-%End
-
->>>>>>> 7b8aad6203 (Removed settings struct)
     bool setValue( const QString &value, const QStringList &dynamicKeyPartList ) const;
 %Docstring
 Set settings value.
@@ -413,19 +398,11 @@ The ``description`` argument specifies a description for the settings entry.
     bool setValue( const QStringList &value, const QString &dynamicKeyPart = QString() ) const;
 %Docstring
 Set settings value.
-<<<<<<< HEAD
 
 The ``value`` to set.
 The ``dynamicKeyPart`` argument specifies the dynamic part of the settings key.
 %End
 
-=======
-
-The ``value`` to set.
-The ``dynamicKeyPart`` argument specifies the dynamic part of the settings key.
-%End
-
->>>>>>> 7b8aad6203 (Removed settings struct)
     bool setValue( const QStringList &value, const QStringList &dynamicKeyPartList ) const;
 %Docstring
 Set settings value.
@@ -670,19 +647,11 @@ The ``description`` argument specifies a description for the settings entry.
     bool setValue( double value, const QString &dynamicKeyPart = QString() ) const;
 %Docstring
 Set settings value.
-<<<<<<< HEAD
-
-The ``value`` to set.
-The ``dynamicKeyPart`` argument specifies the dynamic part of the settings key.
-%End
-
-=======
 
 The ``value`` to set.
 The ``dynamicKeyPart`` argument specifies the dynamic part of the settings key.
 %End
 
->>>>>>> 7b8aad6203 (Removed settings struct)
     bool setValue( double value, const QStringList &dynamicKeyPartList ) const;
 %Docstring
 Set settings value.

diff --git a/python/core/auto_generated/settings/qgssettingsregistry.sip.in b/python/core/auto_generated/settings/qgssettingsregistry.sip.in
@@ -31,7 +31,6 @@ Constructor for QgsSettingsRegistry.
 
     virtual ~QgsSettingsRegistry();
 
-<<<<<<< HEAD
     QList<const QgsSettingsEntryBase *> getChildSettingsEntries() const;
 %Docstring
 Returns the list of registered :py:class:`QgsSettingsEntryBase`.
@@ -56,13 +55,6 @@ Returns the list of registered child QgsSettingsRegistry.
 
   protected:
 
-=======
-    const QgsSettingsEntryBase *getSettingsEntry( const QString &key );
-%Docstring
-Returns the :py:class:`QgsSettingsEntry` with the given ``key`` or None if not found.
-%End
-
->>>>>>> 7b8aad6203 (Removed settings struct)
     void addSettingsEntry( const QgsSettingsEntryBase *settingsEntry );
 %Docstring
 Add ``settingsEntry`` to the register.

diff --git a/python/core/auto_generated/settings/qgssettingsregistrycore.sip.in b/python/core/auto_generated/settings/qgssettingsregistrycore.sip.in
@@ -70,9 +70,7 @@ typedef QgsSettingsEntryEnumFlag<QgsSnappingConfig::SnappingTypes> QgsSettingsEn
 
 
 
-
-
-class QgsSettingsRegistryCore
+class QgsSettingsRegistryCore : QgsSettingsRegistry
 {
 %Docstring(signature="appended")
 :py:class:`QgsSettingsRegistryCore` is used for settings introspection and collects all
@@ -93,17 +91,6 @@ Constructor for QgsSettingsRegistryCore.
 
     virtual ~QgsSettingsRegistryCore();
 
-<<<<<<< HEAD
-    const QgsSettingsEntryBase *getSettingsEntry( const QString &key );
-%Docstring
-Returns the :py:class:`QgsSettingsEntry` with the given ``key`` or None if not found.
-%End
-
-    void addSettingsEntry( const QgsSettingsEntryBase *settingsEntry );
-%Docstring
-Add ``settingsEntry`` to the register.
-%End
-=======
     const QgsSettingsEntryInteger settingsDigitizingStreamTolerance;
 
     const QgsSettingsEntryInteger settingsDigitizingLineWidth;
@@ -177,7 +164,6 @@ Add ``settingsEntry`` to the register.
     const QgsSettingsEntryBool settingsDigitizingOffsetShowAdvanced;
 
     const QgsSettingsEntryInteger settingsDigitizingTracingMaxFeatureCount;
->>>>>>> 27bb50bc4d (Enum flag sip)
 
 };