fix warnings when calling without dynamic parts

qgis · Jan 16, 2023 · d695ca3 · d695ca3
1 parent cffd363
commit d695ca3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/settings/qgssettingstreeelement.cpp b/src/core/settings/qgssettingstreeelement.cpp
@@ -84,7 +84,7 @@ QgsSettingsEntryBase *QgsSettingsTreeElement::childSetting( const QString &key )
   QList<QgsSettingsEntryBase *>::iterator it = mChildrenSettings.begin();
   for ( ; it != mChildrenSettings.end(); ++it )
   {
-    if ( ( *it )->key() == testCompleteKey )
+    if ( ( *it )->definitionKey() == testCompleteKey )
       return *it;
   }
   return nullptr;

diff --git a/tests/src/python/test_qgssettingstreeelement.py b/tests/src/python/test_qgssettingstreeelement.py
@@ -92,15 +92,15 @@ def test_named_list(self):
         self.assertEqual(nl2.namedElementsCount(), 2)
         self.assertEqual(nl2.childrenElements(), [])
         self.assertEqual(len(nl2.childrenSettings()), 0)  # the setting for the current selection
-        self.assertEqual(nl2.selectedItemSetting().key(), f"/plugins/{self.pluginName}/level-1/my_list/items/%1/my_nested_list/selected")
+        self.assertEqual(nl2.selectedItemSetting().definitionKey(), f"/plugins/{self.pluginName}/level-1/my_list/items/%1/my_nested_list/selected")
         selected_key = f"/plugins/{self.pluginName}/level-1/my_list/items/item1/my_nested_list/selected"
         self.assertEqual(QgsSettings().value(selected_key), None)
         nl2.setSelectedItem("xxx", ["item1"])
         self.assertEqual(QgsSettings().value(selected_key), "xxx")
 
         # list with settings
         setting = QgsSettingsEntryString("mysetting-inlist", nl2)
-        self.assertEqual(setting.key(), f"/plugins/{self.pluginName}/level-1/my_list/items/%1/my_nested_list/items/%2/mysetting-inlist")
+        self.assertEqual(setting.definitionKey(), f"/plugins/{self.pluginName}/level-1/my_list/items/%1/my_nested_list/items/%2/mysetting-inlist")
         self.assertEqual(setting.key(['item1', 'item2']), f"/plugins/{self.pluginName}/level-1/my_list/items/item1/my_nested_list/items/item2/mysetting-inlist")
         self.assertEqual(nl2.childrenElements(), [])
         self.assertEqual(len(nl2.childrenSettings()), 1)