summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2013-04-15 15:31:12 +0200
committerMarco Bubke <marco.bubke@digia.com>2013-04-16 16:52:00 +0200
commit5d3c1a2a2bd16829d3cbff450bde3230b3f15bb4 (patch)
tree6d6dedee8239e25594240257326573269d16b765
parent0de92376999fac810fb28f30723e64aaed257fcb (diff)
downloadqt-creator-5d3c1a2a2bd16829d3cbff450bde3230b3f15bb4.tar.gz
QmlDesigner: Remove old functions in instances
Change-Id: If886ca208de775472c4e97e986c2f4df81615959 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp14
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h4
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp4
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h1
-rw-r--r--share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp10
-rw-r--r--share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h2
6 files changed, 0 insertions, 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;