diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 10:01:09 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 09:35:19 +0000 |
| commit | aabd19b0f58816a76f24d13a318a4952d45baba4 (patch) | |
| tree | 2703bc824a772230e4db40ebbc8aff1f9138b33f /examples/declarative | |
| parent | a635af92eb7ee24b6f5273b4467fb2bd2a2e7684 (diff) | |
Examples: Remove utils.py
It is no longer required for Python3.
Change-Id: I5cbdcae5273e59e494c61319fe986c4611dbab97
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'examples/declarative')
5 files changed, 15 insertions, 20 deletions
diff --git a/examples/declarative/extending/chapter1-basics/basics.py b/examples/declarative/extending/chapter1-basics/basics.py index e75e1b330..a604a05bc 100644 --- a/examples/declarative/extending/chapter1-basics/basics.py +++ b/examples/declarative/extending/chapter1-basics/basics.py @@ -41,9 +41,8 @@ """PySide2 port of the qml/tutorials/extending-qml/chapter1-basics example from Qt v5.x""" -import sys, os -sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'utils')) -from utils import text_type +import os +import sys from PySide2.QtCore import Property, Signal, QUrl from PySide2.QtGui import QGuiApplication, QPen, QPainter, QColor @@ -76,7 +75,7 @@ class PieChart (QQuickPaintedItem): nameChanged = Signal() color = Property(QColor, getColor, setColor) - name = Property(text_type, getName, setName, notify=nameChanged) + name = Property(str, getName, setName, notify=nameChanged) if __name__ == '__main__': app = QGuiApplication(sys.argv) diff --git a/examples/declarative/extending/chapter2-methods/methods.py b/examples/declarative/extending/chapter2-methods/methods.py index e2a4eb804..819d4514a 100644 --- a/examples/declarative/extending/chapter2-methods/methods.py +++ b/examples/declarative/extending/chapter2-methods/methods.py @@ -41,9 +41,8 @@ """PySide2 port of the qml/tutorials/extending-qml/chapter2-methods example from Qt v5.x""" -import sys, os -sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'utils')) -from utils import text_type +import os +import sys from PySide2.QtCore import Property, Signal, Slot, QUrl, Qt from PySide2.QtGui import QGuiApplication, QPen, QPainter, QColor @@ -74,7 +73,7 @@ class PieChart (QQuickPaintedItem): self._name = value color = Property(QColor, getColor, setColor) - name = Property(text_type, getName, setName) + name = Property(str, getName, setName) chartCleared = Signal() @Slot() # This should be something like @Invokable diff --git a/examples/declarative/extending/chapter3-bindings/bindings.py b/examples/declarative/extending/chapter3-bindings/bindings.py index b603cb65e..62e19c955 100644 --- a/examples/declarative/extending/chapter3-bindings/bindings.py +++ b/examples/declarative/extending/chapter3-bindings/bindings.py @@ -41,9 +41,8 @@ """PySide2 port of the qml/tutorials/extending-qml/chapter3-bindings example from Qt v5.x""" -import sys, os -sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'utils')) -from utils import text_type +import os +import sys from PySide2.QtCore import Property, Signal, Slot, QUrl, Qt from PySide2.QtGui import QGuiApplication, QPen, QPainter, QColor @@ -79,7 +78,7 @@ class PieChart (QQuickPaintedItem): colorChanged = Signal() color = Property(QColor, getColor, setColor, notify=colorChanged) - name = Property(text_type, getName, setName) + name = Property(str, getName, setName) chartCleared = Signal() @Slot() # This should be something like @Invokable diff --git a/examples/declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py b/examples/declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py index 888cb4861..b07aad59b 100644 --- a/examples/declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py +++ b/examples/declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py @@ -41,9 +41,8 @@ """PySide2 port of the qml/tutorials/extending-qml/chapter4-customPropertyTypes example from Qt v5.x""" -import sys, os -sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'utils')) -from utils import text_type +import os +import sys from PySide2.QtCore import Property, QUrl from PySide2.QtGui import QGuiApplication, QPen, QPainter, QColor @@ -82,7 +81,7 @@ class PieChart (QQuickItem): def setName(self, value): self._name = value - name = Property(text_type, getName, setName) + name = Property(str, getName, setName) def getPieSlice(self): return self._pieSlice diff --git a/examples/declarative/extending/chapter5-listproperties/listproperties.py b/examples/declarative/extending/chapter5-listproperties/listproperties.py index 5c3c428c2..dd3e5c65c 100644 --- a/examples/declarative/extending/chapter5-listproperties/listproperties.py +++ b/examples/declarative/extending/chapter5-listproperties/listproperties.py @@ -41,9 +41,8 @@ """PySide2 port of the qml/tutorials/extending-qml/chapter5-listproperties example from Qt v5.x""" -import sys, os -sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'utils')) -from utils import text_type +import os +import sys from PySide2.QtCore import Property, QUrl from PySide2.QtGui import QGuiApplication, QPen, QPainter, QColor @@ -97,7 +96,7 @@ class PieChart (QQuickItem): def setName(self, value): self._name = value - name = Property(text_type, getName, setName) + name = Property(str, getName, setName) def appendSlice(self, _slice): _slice.setParentItem(self) |