sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-06 00:03:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

[pyqt5toqt6] Replace invalid QVariant() constructor with NULL

Browse Source 
This approach works for both Qt5 and Qt6 builds
This commit is contained in:
Nyall Dawson 2024-02-13 14:10:30 +10:00
parent 5d91c9b420
commit 256f2826f3
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/pyqt5_to_pyqt6/pyqt5_to_pyqt6.py
View File

@ -213,7 +213,21 @@ def fix_file(filename: str, qgis3_compat: bool) -> int:
f'{filename}:{_node.lineno}:{_node.col_offset} WARNING: QDesktopWidget is deprecated and removed in Qt6. Replace with alternative approach instead.\n')
if isinstance(_node.func, ast.Name) and _node.func.id == 'QVariant':
if len(_node.args) == 1 and isinstance(_node.args[0], ast.Attribute) and isinstance(_node.args[0].value, ast.Name) and _node.args[0].value.id == 'QVariant':
if not _node.args:
extra_imports['qgis.core'].update({'NULL'})
def _invalid_qvariant_to_null(start_index: int, tokens):
assert tokens[start_index].src == 'QVariant'
assert tokens[start_index + 1].src == '('
assert tokens[start_index + 2].src == ')'
tokens[start_index] = tokens[start_index]._replace(src='NULL')
for i in range(start_index + 1, start_index + 3):
tokens[i] = tokens[i]._replace(src='')
custom_updates[Offset(_node.lineno,
_node.col_offset)] = _invalid_qvariant_to_null
elif len(_node.args) == 1 and isinstance(_node.args[0], ast.Attribute) and isinstance(_node.args[0].value, ast.Name) and _node.args[0].value.id == 'QVariant':
extra_imports['qgis.core'].update({'NULL'})
def _fix_null_qvariant(start_index: int, tokens):