summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2013-04-15 15:53:19 +0200
committerMarco Bubke <marco.bubke@digia.com>2013-04-16 16:52:26 +0200
commitea8c98c2d8d1d40bed76b6da5898e789ac394669 (patch)
tree609bb70f675a0843648ce0e2562fbd6c5343bec1 /share
parent2b698e31edb96217509db78f7a98c1ca2b77e735 (diff)
downloadqt-creator-ea8c98c2d8d1d40bed76b6da5898e789ac394669.tar.gz
QmlDesigner: Remove stupid code
Change-Id: Ie56c5e26a7ec077b794a4993679ab80a716740ce Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h1
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h1
-rw-r--r--share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h1
-rw-r--r--share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h1
4 files changed, 0 insertions, 4 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
index 6cf3e6f35a..d320a5f8de 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
@@ -57,7 +57,6 @@ public:
QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE;
- using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
void reparent(const ObjectNodeInstance::Pointer &oldParentInstance,
const PropertyName &oldParentProperty,
const ObjectNodeInstance::Pointer &newParentInstance,
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
index b6466feec7..23e09028a9 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
@@ -59,7 +59,6 @@ public:
virtual QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
virtual void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE;
- using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty) Q_DECL_OVERRIDE;
protected:
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
index cbebcdf1c5..4fc823afcf 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
@@ -58,7 +58,6 @@ public:
virtual QVariant property(const PropertyName &name) const;
virtual void resetProperty(const PropertyName &name);
- using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
void reparent(const ObjectNodeInstance::Pointer &oldParentInstance,
const PropertyName &oldParentProperty,
const ObjectNodeInstance::Pointer &newParentInstance,
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
index a7b1274460..7ca7855e18 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
@@ -60,7 +60,6 @@ public:
virtual QVariant property(const PropertyName &name) const;
virtual void resetProperty(const PropertyName &name);
- using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty);
protected: