aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-06-01 16:11:10 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2022-06-04 11:11:54 +0200
commitebc9dbffa73f7129be39823b1809423b119c261d (patch)
tree3c5caf6452167c80a67adb571c2d97da16df7f7c
parentb11e41af64f0d0cf622c01face701f58afbd4e01 (diff)
qtpy2cpp: Move Qt class information to a separate file
Add some flags for more fine-grained information. Task-number: PYSIDE-1945 Change-Id: Ib195284d1c9ee4d50fe8bce25f96c499967262e7 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit df8e46c33e517688ff341cffd4a2cd648a4b5255)
-rw-r--r--tools/qtpy2cpp.pyproject2
-rw-r--r--tools/qtpy2cpp_lib/qt.py92
-rw-r--r--tools/qtpy2cpp_lib/visitor.py12
3 files changed, 95 insertions, 11 deletions
diff --git a/tools/qtpy2cpp.pyproject b/tools/qtpy2cpp.pyproject
index a9d223a4d..f519a4da4 100644
--- a/tools/qtpy2cpp.pyproject
+++ b/tools/qtpy2cpp.pyproject
@@ -1,6 +1,6 @@
{
"files": ["qtpy2cpp.py",
"qtpy2cpp_lib/formatter.py", "qtpy2cpp_lib/visitor.py", "qtpy2cpp_lib/nodedump.py",
- "qtpy2cpp_lib/astdump.py", "qtpy2cpp_lib/tokenizer.py",
+ "qtpy2cpp_lib/astdump.py", "qtpy2cpp_lib/tokenizer.py", "qtpy2cpp_lib/qt.py",
"qtpy2cpp_lib/test_baseline/basic_test.py", "qtpy2cpp_lib/test_baseline/uic.py"]
}
diff --git a/tools/qtpy2cpp_lib/qt.py b/tools/qtpy2cpp_lib/qt.py
new file mode 100644
index 000000000..4efa282f5
--- /dev/null
+++ b/tools/qtpy2cpp_lib/qt.py
@@ -0,0 +1,92 @@
+#############################################################################
+##
+## Copyright (C) 2022 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Qt for Python project.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+"""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 e70cd1fee..a49da2e74 100644
--- a/tools/qtpy2cpp_lib/visitor.py
+++ b/tools/qtpy2cpp_lib/visitor.py
@@ -48,15 +48,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):
@@ -138,7 +130,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