Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

part of CURA-8591
This commit is contained in:
Remco Burema 2021-12-28 14:54:56 +01:00
parent abe7c1bf7f
commit 32b52c6166
No known key found for this signature in database
GPG key ID: 215C49431D43F98C
25 changed files with 167 additions and 167 deletions

View file

@ -20,14 +20,14 @@ class AuthorsModel(ListModel):
self._metadata = None # type: Optional[List[Dict[str, Union[str, List[str], int]]]]
self.addRoleName(Qt.UserRole + 1, "id")
self.addRoleName(Qt.UserRole + 2, "name")
self.addRoleName(Qt.UserRole + 3, "email")
self.addRoleName(Qt.UserRole + 4, "website")
self.addRoleName(Qt.UserRole + 5, "package_count")
self.addRoleName(Qt.UserRole + 6, "package_types")
self.addRoleName(Qt.UserRole + 7, "icon_url")
self.addRoleName(Qt.UserRole + 8, "description")
self.addRoleName(Qt.ItemDataRole.UserRole + 1, "id")
self.addRoleName(Qt.ItemDataRole.UserRole + 2, "name")
self.addRoleName(Qt.ItemDataRole.UserRole + 3, "email")
self.addRoleName(Qt.ItemDataRole.UserRole + 4, "website")
self.addRoleName(Qt.ItemDataRole.UserRole + 5, "package_count")
self.addRoleName(Qt.ItemDataRole.UserRole + 6, "package_types")
self.addRoleName(Qt.ItemDataRole.UserRole + 7, "icon_url")
self.addRoleName(Qt.ItemDataRole.UserRole + 8, "description")
# List of filters for queries. The result is the union of the each list of results.
self._filter = {} # type: Dict[str, str]

View file

@ -20,11 +20,11 @@ class SubscribedPackagesModel(ListModel):
self._discrepancies = None
self._sdk_version = ApplicationMetadata.CuraSDKVersion
self.addRoleName(Qt.UserRole + 1, "package_id")
self.addRoleName(Qt.UserRole + 2, "display_name")
self.addRoleName(Qt.UserRole + 3, "icon_url")
self.addRoleName(Qt.UserRole + 4, "is_compatible")
self.addRoleName(Qt.UserRole + 5, "is_dismissed")
self.addRoleName(Qt.ItemDataRole.UserRole + 1, "package_id")
self.addRoleName(Qt.ItemDataRole.UserRole + 2, "display_name")
self.addRoleName(Qt.ItemDataRole.UserRole + 3, "icon_url")
self.addRoleName(Qt.ItemDataRole.UserRole + 4, "is_compatible")
self.addRoleName(Qt.ItemDataRole.UserRole + 5, "is_dismissed")
@pyqtProperty(bool, constant=True)
def hasCompatiblePackages(self) -> bool:

View file

@ -14,11 +14,11 @@ class ConfigsModel(ListModel):
self._configs = None
self.addRoleName(Qt.UserRole + 1, "machine")
self.addRoleName(Qt.UserRole + 2, "print_core")
self.addRoleName(Qt.UserRole + 3, "build_plate")
self.addRoleName(Qt.UserRole + 4, "support_material")
self.addRoleName(Qt.UserRole + 5, "quality")
self.addRoleName(Qt.ItemDataRole.UserRole + 1, "machine")
self.addRoleName(Qt.ItemDataRole.UserRole + 2, "print_core")
self.addRoleName(Qt.ItemDataRole.UserRole + 3, "build_plate")
self.addRoleName(Qt.ItemDataRole.UserRole + 4, "support_material")
self.addRoleName(Qt.ItemDataRole.UserRole + 5, "quality")
def setConfigs(self, configs):
self._configs = configs

View file

@ -23,28 +23,28 @@ class PackagesModel(ListModel):
self._metadata = None
self.addRoleName(Qt.UserRole + 1, "id")
self.addRoleName(Qt.UserRole + 2, "type")
self.addRoleName(Qt.UserRole + 3, "name")
self.addRoleName(Qt.UserRole + 4, "version")
self.addRoleName(Qt.UserRole + 5, "author_id")
self.addRoleName(Qt.UserRole + 6, "author_name")
self.addRoleName(Qt.UserRole + 7, "author_email")
self.addRoleName(Qt.UserRole + 8, "description")
self.addRoleName(Qt.UserRole + 9, "icon_url")
self.addRoleName(Qt.UserRole + 10, "image_urls")
self.addRoleName(Qt.UserRole + 11, "download_url")
self.addRoleName(Qt.UserRole + 12, "last_updated")
self.addRoleName(Qt.UserRole + 13, "is_bundled")
self.addRoleName(Qt.UserRole + 14, "is_active")
self.addRoleName(Qt.UserRole + 15, "is_installed") # Scheduled pkgs are included in the model but should not be marked as actually installed
self.addRoleName(Qt.UserRole + 16, "has_configs")
self.addRoleName(Qt.UserRole + 17, "supported_configs")
self.addRoleName(Qt.UserRole + 18, "download_count")
self.addRoleName(Qt.UserRole + 19, "tags")
self.addRoleName(Qt.UserRole + 20, "links")
self.addRoleName(Qt.UserRole + 21, "website")
self.addRoleName(Qt.UserRole + 22, "login_required")
self.addRoleName(Qt.ItemDataRole.UserRole + 1, "id")
self.addRoleName(Qt.ItemDataRole.UserRole + 2, "type")
self.addRoleName(Qt.ItemDataRole.UserRole + 3, "name")
self.addRoleName(Qt.ItemDataRole.UserRole + 4, "version")
self.addRoleName(Qt.ItemDataRole.UserRole + 5, "author_id")
self.addRoleName(Qt.ItemDataRole.UserRole + 6, "author_name")
self.addRoleName(Qt.ItemDataRole.UserRole + 7, "author_email")
self.addRoleName(Qt.ItemDataRole.UserRole + 8, "description")
self.addRoleName(Qt.ItemDataRole.UserRole + 9, "icon_url")
self.addRoleName(Qt.ItemDataRole.UserRole + 10, "image_urls")
self.addRoleName(Qt.ItemDataRole.UserRole + 11, "download_url")
self.addRoleName(Qt.ItemDataRole.UserRole + 12, "last_updated")
self.addRoleName(Qt.ItemDataRole.UserRole + 13, "is_bundled")
self.addRoleName(Qt.ItemDataRole.UserRole + 14, "is_active")
self.addRoleName(Qt.ItemDataRole.UserRole + 15, "is_installed") # Scheduled pkgs are included in the model but should not be marked as actually installed
self.addRoleName(Qt.ItemDataRole.UserRole + 16, "has_configs")
self.addRoleName(Qt.ItemDataRole.UserRole + 17, "supported_configs")
self.addRoleName(Qt.ItemDataRole.UserRole + 18, "download_count")
self.addRoleName(Qt.ItemDataRole.UserRole + 19, "tags")
self.addRoleName(Qt.ItemDataRole.UserRole + 20, "links")
self.addRoleName(Qt.ItemDataRole.UserRole + 21, "website")
self.addRoleName(Qt.ItemDataRole.UserRole + 22, "login_required")
# List of filters for queries. The result is the union of the each list of results.
self._filter = {} # type: Dict[str, str]