Qt6 upgrade performed by pyqgis4-checker:

> docker run -it --rm -v /home/dave/dev/opengisch/QgisModelBakerLibrary:/home/pyqgisdev/ registry.gitlab.com/oslandia/qgis/pyqgis-4-checker/pyqgis-qt-checker:latest pyqt5_to_pyqt6.py --logfile /home/pyqgisdev/pyqt6_checker.log .
> For big parts this resolves opengisch/QgisModelBaker#985

Author: signedav

modelbaker/dataobjects/fields.py

@@ -66,11 +66,11 @@ def create(self, layer: Layer) -> None:
             # if defined, then set not null and unique constraints
             layer.layer.setFieldConstraint(
                 field_idx,
-                QgsFieldConstraints.ConstraintNotNull,
-                QgsFieldConstraints.ConstraintStrengthHard,
+                QgsFieldConstraints.Constraint.ConstraintNotNull,
+                QgsFieldConstraints.ConstraintStrength.ConstraintStrengthHard,
             )
             layer.layer.setFieldConstraint(
                 field_idx,
-                QgsFieldConstraints.ConstraintUnique,
-                QgsFieldConstraints.ConstraintStrengthHard,
+                QgsFieldConstraints.Constraint.ConstraintUnique,
+                QgsFieldConstraints.ConstraintStrength.ConstraintStrengthHard,
             )

modelbaker/dataobjects/form.py

@@ -116,7 +116,7 @@ def create(
         root_container.clear()
         for element in self.__elements:
             root_container.addChildElement(element.create(root_container, qgis_layer))
-        edit_form_config.setLayout(QgsEditFormConfig.TabLayout)
+        edit_form_config.setLayout(QgsEditFormConfig.EditorLayout.TabLayout)
         # set nm-rel if referencing tables are junction table
         for relation in project.relations:
             if relation.referenced_layer == layer:

modelbaker/dataobjects/layers.py

@@ -52,7 +52,7 @@ def __init__(
         srid: Optional[int] = None,
         extent: Optional[str] = None,
         geometry_column: str = None,
-        wkb_type: QgsWkbTypes = QgsWkbTypes.Unknown,
+        wkb_type: QgsWkbTypes = QgsWkbTypes.Type.Unknown,
         alias: Optional[str] = None,
         is_domain: bool = False,  # is enumeration or catalogue
         is_structure: bool = False,

modelbaker/dataobjects/project.py

@@ -316,7 +316,7 @@ def create(
                     )
 
         for layer in self.layers:
-            if layer.layer.type() == QgsMapLayer.VectorLayer:
+            if layer.layer.type() == QgsMapLayer.LayerType.VectorLayer:
                 # even when a style will be loaded we create the form because not sure if the style contains form settngs
                 layer.create_form(self)
                 layer.store_variables(self)

modelbaker/dataobjects/relations.py

@@ -10,7 +10,7 @@ def __init__(self) -> None:
         self.referencing_field = None
         self.referenced_field = None
         self.name = None
-        self.strength = QgsRelation.Association
+        self.strength = QgsRelation.RelationStrength.Association
         self.cardinality_max = None
         self.cardinality_min = None
         self.child_domain_name = None

modelbaker/dbconnector/gpkg_connector.py

@@ -775,7 +775,7 @@ def ili_version(self):
         cursor.close()
         if result > 1:
             self.new_message.emit(
-                Qgis.Warning,
+                Qgis.MessageLevel.Warning,
                 "DB schema created with ili2db version 3. Better use version 4.",
             )
             return 3

modelbaker/dbconnector/mssql_connector.py

@@ -892,7 +892,7 @@ def ili_version(self):
         res = cur.fetchone()[0]
         if res > 0:
             self.new_message.emit(
-                Qgis.Warning,
+                Qgis.MessageLevel.Warning,
                 "DB schema created with ili2db version 3. Better use version 4.",
             )
             return 3

modelbaker/dbconnector/pg_connector.py

@@ -983,7 +983,7 @@ def ili_version(self):
         )
         if cur.rowcount > 1:
             self.new_message.emit(
-                Qgis.Warning,
+                Qgis.MessageLevel.Warning,
                 "DB schema created with ili2db version 3. Better use version 4.",
             )
             return 3

modelbaker/generator/generator.py

@@ -303,7 +303,7 @@ def layers(self, filter_layer_list: list = []) -> list[Layer]:
                 record.get("srid"),
                 record.get("extent"),
                 record.get("geometry_column"),
-                QgsWkbTypes.parseType(record["type"]) or QgsWkbTypes.Unknown,
+                QgsWkbTypes.parseType(record["type"]) or QgsWkbTypes.Type.Unknown,
                 alias,
                 is_domain,
                 is_structure,
@@ -437,14 +437,14 @@ def layers(self, filter_layer_list: list = []) -> list[Layer]:
                     field.widget_config["calendar_popup"] = True
 
                     dateFormat = QLocale(QgsApplication.instance().locale()).dateFormat(
-                        QLocale.ShortFormat
+                        QLocale.FormatType.ShortFormat
                     )
                     timeFormat = QLocale(QgsApplication.instance().locale()).timeFormat(
-                        QLocale.ShortFormat
+                        QLocale.FormatType.ShortFormat
                     )
                     dateTimeFormat = QLocale(
                         QgsApplication.instance().locale()
-                    ).dateTimeFormat(QLocale.ShortFormat)
+                    ).dateTimeFormat(QLocale.FormatType.ShortFormat)
 
                     if data_type == self._db_connector.QGIS_TIME_TYPE:
                         field.widget_config["display_format"] = timeFormat
@@ -585,7 +585,7 @@ def relations(self, layers, filter_layer_list=[]):
                             "assoc_cardinality_min", None
                         )
 
-                        relation.strength = QgsRelation.Association
+                        relation.strength = QgsRelation.RelationStrength.Association
                         if (
                             # if it's a defined composition...
                             record.get("strength", None) == "COMPOSITE"
@@ -603,7 +603,7 @@ def relations(self, layers, filter_layer_list=[]):
                             )
                         ):
                             # ...then it's a composition in QGIS
-                            relation.strength = QgsRelation.Composition
+                            relation.strength = QgsRelation.RelationStrength.Composition
 
                         # For domain-class relations, if we have an extended domain, get its child name
                         child_name = None
@@ -968,11 +968,11 @@ def _separated_legend_layers(self, layers):
         for layer in layers:
             if layer.geometry_column:
                 geometry_type = QgsWkbTypes.geometryType(layer.wkb_type)
-                if geometry_type == QgsWkbTypes.PointGeometry:
+                if geometry_type == QgsWkbTypes.GeometryType.PointGeometry:
                     point_layers.append(layer)
-                elif geometry_type == QgsWkbTypes.LineGeometry:
+                elif geometry_type == QgsWkbTypes.GeometryType.LineGeometry:
                     line_layers.append(layer)
-                elif geometry_type == QgsWkbTypes.PolygonGeometry:
+                elif geometry_type == QgsWkbTypes.GeometryType.PolygonGeometry:
                     polygon_layers.append(layer)
             else:
                 if layer.is_domain:

modelbaker/ilitoppingmaker/iliprojecttopping.py

@@ -73,12 +73,12 @@ def makeit(self, project: QgsProject = None):
         Creates everything - generates all the files.
         Returns the path to the ilidata.xml file.
         """
-        self.stdout.emit(self.tr("Generate everything."), Qgis.Info)
+        self.stdout.emit(self.tr("Generate everything."), Qgis.MessageLevel.Info)
         ilidata_path = None
         if not project:
             self.stdout.emit(
                 self.tr("Cannot generate anything without having a QGIS project."),
-                Qgis.Warning,
+                Qgis.MessageLevel.Warning,
             )
             return False
         # Creates and sets the project_topping considering the passed QgsProject and the existing ExportSettings.
@@ -94,7 +94,9 @@ def makeit(self, project: QgsProject = None):
 
         # generate metaconfig (topping) file
         if self.metaconfig.generate_files(self.target):
-            self.stdout.emit(self.tr("MetaConfig written to INI file."), Qgis.Info)
+            self.stdout.emit(
+                self.tr("MetaConfig written to INI file."), Qgis.MessageLevel.Info
+            )
 
         # generate ilidata
         ilidata = IliData()
@@ -104,7 +106,7 @@ def makeit(self, project: QgsProject = None):
         if ilidata_path:
             self.stdout.emit(
                 self.tr("IliData written to XML file: {}").format(ilidata_path),
-                Qgis.Info,
+                Qgis.MessageLevel.Info,
             )
 
         return ilidata_path

modelbaker/iliwrapper/ili2dbargs.py

@@ -97,7 +97,7 @@ def _get_db_args(configuration, hide_password=False):
         if configuration.sslmode:
             temporary_filename = "{}/modelbaker-dbargs.conf".format(QDir.tempPath())
             temporary_file = QFile(temporary_filename)
-            if temporary_file.open(QFile.WriteOnly):
+            if temporary_file.open(QFile.OpenModeFlag.WriteOnly):
                 temporary_file.write(
                     "sslmode={}".format(configuration.sslmode).encode("utf-8")
                 )

modelbaker/iliwrapper/ili2dbconfig.py

@@ -168,7 +168,7 @@ def to_ili2db_args(self):
         )
 
         proxy = QgsNetworkAccessManager.instance().fallbackProxy()
-        if proxy.type() == QNetworkProxy.HttpProxy:
+        if proxy.type() == QNetworkProxy.ProxyType.HttpProxy:
             self.append_args(args, ["--proxy", proxy.hostName()], force_append=True)
             self.append_args(
                 args, ["--proxyPort", str(proxy.port())], force_append=True