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

Do not use QWeakPointer to track QObjects.

Browse Source 
This use case is deprecated in Qt 5. Use QPointer instead.

Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Christian Kandeler
2012-09-24 13:48:18 +02:00
parent f21a408b51
commit aef4280bc1
23 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/coreplugin/designmode.cpp
View File

@@ -45,6 +45,7 @@
#include <QPair>
#include <QFileInfo>
#include <QPointer>
#include <QStringList>
#include <QDebug>
@@ -101,7 +102,7 @@ public:
public:
Internal::DesignModeCoreListener *m_coreListener;
QWeakPointer<Core::IEditor> m_currentEditor;
QPointer<Core::IEditor> m_currentEditor;
bool m_isActive;
bool m_isRequired;
QList<DesignEditorInfo*> m_editors;
@@ -237,10 +238,10 @@ void DesignMode::currentEditorChanged(Core::IEditor *editor)
if (ModeManager::currentMode() == this)
ModeManager::activateMode(Core::Constants::MODE_EDIT);
setEnabled(false);
d->m_currentEditor = QWeakPointer<Core::IEditor>();
d->m_currentEditor = 0;
emit actionsUpdated(d->m_currentEditor.data());
} else {
d->m_currentEditor = QWeakPointer<Core::IEditor>(editor);
d->m_currentEditor = editor;
if (d->m_currentEditor)
connect(d->m_currentEditor.data(), SIGNAL(changed()), this, SLOT(updateActions()));