diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-06-01 16:11:10 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-06-03 10:10:20 +0200 |
| commit | df8e46c33e517688ff341cffd4a2cd648a4b5255 (patch) | |
| tree | 898f11fab6712cfa1272eb8f123807dc4bcf5ff9 /tools/qtpy2cpp_lib | |
| parent | 563613fefd81090d1947f16259394a830681492d (diff) | |
qtpy2cpp: Move Qt class information to a separate file
Add some flags for more fine-grained information.
Pick-to: 6.3
Task-number: PYSIDE-1945
Change-Id: Ib195284d1c9ee4d50fe8bce25f96c499967262e7
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'tools/qtpy2cpp_lib')
| -rw-r--r-- | tools/qtpy2cpp_lib/qt.py | 56 | ||||
| -rw-r--r-- | tools/qtpy2cpp_lib/visitor.py | 12 |
2 files changed, 58 insertions, 10 deletions
diff --git a/tools/qtpy2cpp_lib/qt.py b/tools/qtpy2cpp_lib/qt.py new file mode 100644 index 000000000..69bd54aeb --- /dev/null +++ b/tools/qtpy2cpp_lib/qt.py @@ -0,0 +1,56 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +"""Provides some type information on Qt classes""" + + +from enum import Flag + + +class ClassFlag(Flag): + PASS_BY_CONSTREF = 1 + PASS_BY_REF = 2 + PASS_BY_VALUE = 4 + PASS_ON_STACK_MASK = PASS_BY_CONSTREF | PASS_BY_REF | PASS_BY_VALUE + INSTANTIATE_ON_STACK = 8 + + +_QT_CLASS_FLAGS = { + "QBrush": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QGradient": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QIcon": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QLine": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QLineF": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QPixmap": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QPointF": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QRect": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QRectF": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QSizeF": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QString": ClassFlag.PASS_BY_CONSTREF | ClassFlag.INSTANTIATE_ON_STACK, + "QFile": ClassFlag.PASS_BY_REF | ClassFlag.INSTANTIATE_ON_STACK, + "QSettings": ClassFlag.PASS_BY_REF | ClassFlag.INSTANTIATE_ON_STACK, + "QTextStream": ClassFlag.PASS_BY_REF | ClassFlag.INSTANTIATE_ON_STACK, + "QColor": ClassFlag.PASS_BY_VALUE | ClassFlag.INSTANTIATE_ON_STACK, + "QPoint": ClassFlag.PASS_BY_VALUE | ClassFlag.INSTANTIATE_ON_STACK, + "QSize": ClassFlag.PASS_BY_VALUE | ClassFlag.INSTANTIATE_ON_STACK, + "QApplication": ClassFlag.INSTANTIATE_ON_STACK, + "QColorDialog": ClassFlag.INSTANTIATE_ON_STACK, + "QCoreApplication": ClassFlag.INSTANTIATE_ON_STACK, + "QFileDialog": ClassFlag.INSTANTIATE_ON_STACK, + "QFileInfo": ClassFlag.INSTANTIATE_ON_STACK, + "QFontDialog": ClassFlag.INSTANTIATE_ON_STACK, + "QGuiApplication": ClassFlag.INSTANTIATE_ON_STACK, + "QMessageBox": ClassFlag.INSTANTIATE_ON_STACK, + "QPainter": ClassFlag.INSTANTIATE_ON_STACK, + "QPen": ClassFlag.INSTANTIATE_ON_STACK, + "QQmlApplicationEngine": ClassFlag.INSTANTIATE_ON_STACK, + "QQmlComponent": ClassFlag.INSTANTIATE_ON_STACK, + "QQmlEngine": ClassFlag.INSTANTIATE_ON_STACK, + "QQuickView": ClassFlag.INSTANTIATE_ON_STACK, + "QSaveFile": ClassFlag.INSTANTIATE_ON_STACK +} + + +def qt_class_flags(type): + f = _QT_CLASS_FLAGS.get(type) + return f if f else ClassFlag(0) diff --git a/tools/qtpy2cpp_lib/visitor.py b/tools/qtpy2cpp_lib/visitor.py index 286fa9b4d..97048dec4 100644 --- a/tools/qtpy2cpp_lib/visitor.py +++ b/tools/qtpy2cpp_lib/visitor.py @@ -12,15 +12,7 @@ from .formatter import (CppFormatter, format_for_loop, format_literal, format_reference, format_start_function_call, write_import, write_import_from) from .nodedump import debug_format_node - - -_QT_STACK_CLASSES = ["QApplication", "QColorDialog", "QCoreApplication", - "QFile", "QFileDialog", "QFileInfo", "QFontDialog", - "QGuiApplication", "QIcon", "QLine", "QLineF", - "QMessageBox", "QPainter", "QPixmap", "QPoint", "QPointF", - "QQmlApplicationEngine", "QQmlComponent", "QQmlEngine", - "QQuickView", "QRect", "QRectF", "QSaveFile", "QSettings", - "QSize", "QSizeF", "QTextStream"] +from .qt import ClassFlag, qt_class_flags def _is_qt_constructor(assign_node): @@ -102,7 +94,7 @@ class ConvertVisitor(ast.NodeVisitor, CppFormatter): self.INDENT() qt_class = _is_qt_constructor(node) - on_stack = qt_class and qt_class in _QT_STACK_CLASSES + on_stack = qt_class and qt_class_flags(qt_class) & ClassFlag.INSTANTIATE_ON_STACK # Is this a free variable and not a member assignment? Instantiate # on stack or give a type |