feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Reduce visible use of QWeakPointer

Browse Source 
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>
This commit is contained in:
hjk
2019-08-19 11:48:18 +02:00
parent 309021a73f
commit 3bf3feb33c
5 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/designercore/include/abstractproperty.h
View File

@@ -40,7 +40,6 @@ namespace QmlDesigner {
using InternalNodePointer = QSharedPointer<InternalNode>; using InternalNodePointer = QSharedPointer<InternalNode>;
using InternalPropertyPointer = QSharedPointer<InternalProperty>; using InternalPropertyPointer = QSharedPointer<InternalProperty>;
using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
} }
class Model; class Model;

1
src/plugins/qmldesigner/designercore/include/abstractview.h
View File

@@ -50,7 +50,6 @@ namespace QmlDesigner {
namespace Internal { namespace Internal {
class InternalNode; class InternalNode;
using InternalNodePointer = QSharedPointer<InternalNode>; using InternalNodePointer = QSharedPointer<InternalNode>;
using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
} }
} }

1
src/plugins/qmldesigner/designercore/include/modelnode.h
View File

@@ -44,7 +44,6 @@ namespace Internal {
using InternalNodePointer = QSharedPointer<InternalNode>; using InternalNodePointer = QSharedPointer<InternalNode>;
using InternalPropertyPointer = QSharedPointer<InternalProperty>; using InternalPropertyPointer = QSharedPointer<InternalProperty>;
using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
} }
class NodeMetaInfo; class NodeMetaInfo;
class AbstractProperty; class AbstractProperty;

1
src/plugins/qmldesigner/designercore/model/internalnode_p.h
View File

@@ -47,7 +47,6 @@ class InternalNode;
using InternalNodePointer = QSharedPointer<InternalNode>; using InternalNodePointer = QSharedPointer<InternalNode>;
using InternalPropertyPointer = QSharedPointer<InternalProperty>; using InternalPropertyPointer = QSharedPointer<InternalProperty>;
using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
class InternalNode class InternalNode
{ {

6
src/plugins/qmldesigner/designercore/model/internalproperty.h
View File

@@ -43,13 +43,11 @@ class InternalNodeAbstractProperty;
class InternalNode; class InternalNode;
using InternalNodePointer = QSharedPointer<InternalNode>; using InternalNodePointer = QSharedPointer<InternalNode>;
using InternalNodeWeakPointer = QWeakPointer<InternalNode>;
class QMLDESIGNERCORE_EXPORT InternalProperty class QMLDESIGNERCORE_EXPORT InternalProperty
{ {
public: public:
using Pointer = QSharedPointer<InternalProperty>; using Pointer = QSharedPointer<InternalProperty>;
using WeakPointer = QWeakPointer<InternalProperty>;
InternalProperty(); InternalProperty();
virtual ~InternalProperty(); virtual ~InternalProperty();
@@ -86,10 +84,10 @@ protected: // functions
void setInternalWeakPointer(const Pointer &pointer); void setInternalWeakPointer(const Pointer &pointer);
void setDynamicTypeName(const TypeName &name); void setDynamicTypeName(const TypeName &name);
private: private:
WeakPointer m_internalPointer; QWeakPointer<InternalProperty> m_internalPointer;
PropertyName m_name; PropertyName m_name;
TypeName m_dynamicType; TypeName m_dynamicType;
InternalNodeWeakPointer m_propertyOwner; QWeakPointer<InternalNode> m_propertyOwner;
}; };