From ea8c98c2d8d1d40bed76b6da5898e789ac394669 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Mon, 15 Apr 2013 15:53:19 +0200
Subject: [PATCH] QmlDesigner: Remove stupid code
Change-Id: Ie56c5e26a7ec077b794a4993679ab80a716740ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h | 1 -
.../qml2puppet/instances/qmlpropertychangesnodeinstance.h | 1 -
.../qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h | 1 -
.../qmlpuppet/instances/qmlpropertychangesnodeinstance.h | 1 -
4 files changed, 4 deletions(-)
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
index 6cf3e6f35a1..d320a5f8deb 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 b6466feec72..23e09028a93 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 cbebcdf1c52..4fc823afcfa 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 a7b12744604..7ca7855e18e 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:
--
GitLab