misc refactoring

Author: nmaarnio

arho_feature_template/core/plan_manager.py

@@ -51,6 +51,7 @@
 from arho_feature_template.utils.misc_utils import (
     LANGUAGE,
     check_layer_changes,
+    disconnect_signal,
     get_active_plan_id,
     handle_unsaved_changes,
     iface,
@@ -160,7 +161,7 @@ def edit_regulation_group(self, regulation_group: RegulationGroup):
     def _open_regulation_group_form(self, regulation_group: RegulationGroup):
         regulation_group_form = PlanRegulationGroupForm(regulation_group)
         if regulation_group_form.exec_():
-            if regulation_group_form.save_as_config is True:
+            if regulation_group_form.save_as_config:
                 save_regulation_group_as_config(regulation_group_form.model)
             else:
                 save_regulation_group(regulation_group_form.model)
@@ -190,8 +191,8 @@ def initialize_feature_digitize_map_tool(self, layer: QgsVectorLayer | None = No
 
         # Disconnect signals first to not trigger them unwantedly
         if self.feature_digitize_map_tool:
-            self.feature_digitize_map_tool.digitizingCompleted.disconnect()
-            self.feature_digitize_map_tool.digitizingFinished.disconnect()
+            disconnect_signal(self.feature_digitize_map_tool.digitizingCompleted)
+            disconnect_signal(self.feature_digitize_map_tool.digitizingFinished)
 
         # Reinitialize and reconnect signals
         self.feature_digitize_map_tool = PlanFeatureDigitizeMapTool(mode)

arho_feature_template/plugin.py

@@ -13,7 +13,7 @@
 from arho_feature_template.qgis_plugin_tools.tools.custom_logging import setup_logger, teardown_logger
 from arho_feature_template.qgis_plugin_tools.tools.i18n import setup_translation
 from arho_feature_template.qgis_plugin_tools.tools.resources import plugin_name, resources_path
-from arho_feature_template.utils.misc_utils import iface
+from arho_feature_template.utils.misc_utils import disconnect_signal, iface
 
 
 class Plugin:
@@ -257,7 +257,7 @@ def open_settings(self):
     def unload(self) -> None:
         """Removes the plugin menu item and icon from QGIS GUI."""
         # Handle signals
-        self.plan_manager.new_feature_dock.visibilityChanged.disconnect()
+        disconnect_signal(self.plan_manager.new_feature_dock.visibilityChanged)
         iface.mapCanvas().mapToolSet.disconnect()
         iface.projectRead.disconnect()