From 5d3c1a2a2bd16829d3cbff450bde3230b3f15bb4 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 15 Apr 2013 15:31:12 +0200 Subject: QmlDesigner: Remove old functions in instances Change-Id: If886ca208de775472c4e97e986c2f4df81615959 Reviewed-by: Thomas Hartmann --- .../qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp | 14 -------------- .../qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h | 4 ---- .../qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 4 ---- .../qmlpuppet/qml2puppet/instances/objectnodeinstance.h | 1 - .../qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp | 10 ---------- .../qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h | 2 -- 6 files changed, 35 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp index 3ba0afc025..af5b7ff3ef 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp @@ -42,10 +42,6 @@ DummyNodeInstance::Pointer DummyNodeInstance::create() return Pointer(new DummyNodeInstance); } -void DummyNodeInstance::paint(QPainter * /*painter*/) -{ -} - QRectF DummyNodeInstance::boundingRect() const { return QRectF(); @@ -90,16 +86,6 @@ QVariant DummyNodeInstance::property(const PropertyName &/*name*/) const return QVariant(); } -QStringList DummyNodeInstance::properties() -{ - return QStringList(); -} - -QStringList DummyNodeInstance::localProperties() -{ - return QStringList(); -} - void DummyNodeInstance::initializePropertyWatcher(const ObjectNodeInstance::Pointer &/*objectNodeInstance*/) { diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h index 3746e62a24..d0bdc032c1 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h @@ -45,8 +45,6 @@ public: static Pointer create(); - void paint(QPainter *painter); - QRectF boundingRect() const; QPointF position() const; QSizeF size() const; @@ -57,8 +55,6 @@ public: void setPropertyBinding(const PropertyName &name, const QString &expression); void setId(const QString &id); QVariant property(const PropertyName &name) const; - QStringList properties(); - QStringList localProperties(); void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 699c0fc4d1..ad5f357635 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -1103,10 +1103,6 @@ void ObjectNodeInstance::setResetValue(const PropertyName &propertyName, const Q m_resetValueHash.insert(propertyName, value); } -void ObjectNodeInstance::paint(QPainter * /*painter*/) -{ -} - QImage ObjectNodeInstance::renderImage() const { return QImage(); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h index d310f28129..192350763d 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h @@ -83,7 +83,6 @@ public: void setNodeInstanceServer(NodeInstanceServer *server); virtual void initializePropertyWatcher(const Pointer &objectNodeInstance); virtual void initialize(const Pointer &objectNodeInstance); - virtual void paint(QPainter *painter); virtual QImage renderImage() const; virtual QImage renderPreviewImage(const QSize &previewImageSize) const; diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp index 69547501fb..9fec42ab68 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp @@ -89,16 +89,6 @@ QVariant DummyNodeInstance::property(const PropertyName &/*name*/) const return QVariant(); } -QStringList DummyNodeInstance::properties() -{ - return QStringList(); -} - -QStringList DummyNodeInstance::localProperties() -{ - return QStringList(); -} - void DummyNodeInstance::initializePropertyWatcher(const ObjectNodeInstance::Pointer &/*objectNodeInstance*/) { diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h index 50335eb853..8c047f88b1 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h @@ -56,8 +56,6 @@ public: void setPropertyVariant(const PropertyName &name, const QVariant &value); void setPropertyBinding(const PropertyName &name, const QString &expression); void setId(const QString &id); - QStringList properties(); - QStringList localProperties(); QVariant property(const PropertyName &name) const; -- cgit v1.2.1