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

QmlDesigner.NodeInstances: More pointer fixes

Browse Source 
Change-Id: Ibffe642952bc135420d123dc1d271f4e2b764749
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2012-10-08 13:40:01 +02:00
parent 086dd684ab
commit ca58138102
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
+3 -3
View File
@@ -68,10 +68,10 @@ class NodeInstanceServer : public NodeInstanceServerInterface
{
Q_OBJECT
public:
typedef QPair<QWeakPointer<QObject>, QString> ObjectPropertyPair;
typedef QPair<QPointer<QObject>, QString> ObjectPropertyPair;
typedef QPair<qint32, QString> IdPropertyPair;
typedef QPair<ServerNodeInstance, QString> InstancePropertyPair;
typedef QPair<QString, QWeakPointer<QObject> > DummyPair;
typedef QPair<QString, QPointer<QObject> > DummyPair;
explicit NodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
~NodeInstanceServer();
@@ -206,7 +206,7 @@ private:
QHash<qint32, ServerNodeInstance> m_idInstanceHash;
QHash<QObject*, ServerNodeInstance> m_objectInstanceHash;
QMultiHash<QString, ObjectPropertyPair> m_fileSystemWatcherHash;
QList<QPair<QString, QWeakPointer<QObject> > > m_dummyObjectList;
QList<QPair<QString, QPointer<QObject> > > m_dummyObjectList;
QPointer<QFileSystemWatcher> m_fileSystemWatcher;
QPointer<QFileSystemWatcher> m_dummdataFileSystemWatcher;
QPointer<Internal::ChildrenChangeEventFilter> m_childrenChangeEventFilter;