From 3bf3feb33c9a7cd8ae0a4a59ff21a56322f0eb7e Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 19 Aug 2019 11:48:18 +0200
Subject: [PATCH] QmlDesigner: Reduce visible use of QWeakPointer

So it's easy to spot and later double check the use of the remaining one.
Most typedef have not been used anyway.

Change-Id: Iaa904ef72434b37b1dda42b157952869e578cb08
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qmldesigner/designercore/include/abstractproperty.h     | 1 -
 src/plugins/qmldesigner/designercore/include/abstractview.h | 1 -
 src/plugins/qmldesigner/designercore/include/modelnode.h    | 1 -
 src/plugins/qmldesigner/designercore/model/internalnode_p.h | 1 -
 .../qmldesigner/designercore/model/internalproperty.h       | 6 ++----
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
index 75cb024ccd9..2a74a12539d 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
@@ -40,7 +40,6 @@ namespace QmlDesigner {
 
         using InternalNodePointer = QSharedPointer<InternalNode>;
         using InternalPropertyPointer = QSharedPointer<InternalProperty>;
-        using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
     }
 
 class Model;
diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h
index dcbeb5ee74d..5a8de860c2f 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractview.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractview.h
@@ -50,7 +50,6 @@ namespace QmlDesigner {
     namespace Internal {
         class InternalNode;
         using InternalNodePointer = QSharedPointer<InternalNode>;
-        using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
     }
 }
 
diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h
index 9b228d90f89..abb0300bb89 100644
--- a/src/plugins/qmldesigner/designercore/include/modelnode.h
+++ b/src/plugins/qmldesigner/designercore/include/modelnode.h
@@ -44,7 +44,6 @@ namespace Internal {
 
     using InternalNodePointer = QSharedPointer<InternalNode>;
     using InternalPropertyPointer = QSharedPointer<InternalProperty>;
-    using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
 }
 class NodeMetaInfo;
 class AbstractProperty;
diff --git a/src/plugins/qmldesigner/designercore/model/internalnode_p.h b/src/plugins/qmldesigner/designercore/model/internalnode_p.h
index f31039ffc2d..d8b0e314f84 100644
--- a/src/plugins/qmldesigner/designercore/model/internalnode_p.h
+++ b/src/plugins/qmldesigner/designercore/model/internalnode_p.h
@@ -47,7 +47,6 @@ class InternalNode;
 
 using InternalNodePointer = QSharedPointer<InternalNode>;
 using InternalPropertyPointer = QSharedPointer<InternalProperty>;
-using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
 
 class InternalNode
 {
diff --git a/src/plugins/qmldesigner/designercore/model/internalproperty.h b/src/plugins/qmldesigner/designercore/model/internalproperty.h
index a8eb5b940c7..cf10f8ef7d9 100644
--- a/src/plugins/qmldesigner/designercore/model/internalproperty.h
+++ b/src/plugins/qmldesigner/designercore/model/internalproperty.h
@@ -43,13 +43,11 @@ class InternalNodeAbstractProperty;
 class InternalNode;
 
 using InternalNodePointer = QSharedPointer<InternalNode>;
-using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
 
 class QMLDESIGNERCORE_EXPORT InternalProperty
 {
 public:
     using Pointer = QSharedPointer<InternalProperty>;
-    using WeakPointer = QWeakPointer<InternalProperty>;
 
     InternalProperty();
     virtual ~InternalProperty();
@@ -86,10 +84,10 @@ protected: // functions
     void setInternalWeakPointer(const Pointer &pointer);
     void setDynamicTypeName(const TypeName &name);
 private:
-    WeakPointer m_internalPointer;
+    QWeakPointer<InternalProperty> m_internalPointer;
     PropertyName m_name;
     TypeName m_dynamicType;
-    InternalNodeWeakPointer m_propertyOwner;
+    QWeakPointer<InternalNode> m_propertyOwner;
 
 };