diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2012-09-24 13:48:18 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-09-25 10:45:36 +0200 |
| commit | aef4280bc1594118c2b75cfb1af1061585f0120f (patch) | |
| tree | 808d532991ab97ec9dd2098b40705ad85befa81f /src/plugins/coreplugin/designmode.cpp | |
| parent | f21a408b51c6473414b9733dd0b05715181f0162 (diff) | |
| download | qt-creator-aef4280bc1594118c2b75cfb1af1061585f0120f.tar.gz | |
Do not use QWeakPointer to track QObjects.
This use case is deprecated in Qt 5. Use QPointer instead.
Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/coreplugin/designmode.cpp')
| -rw-r--r-- | src/plugins/coreplugin/designmode.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp index af23ac2976..46aca26a37 100644 --- a/src/plugins/coreplugin/designmode.cpp +++ b/src/plugins/coreplugin/designmode.cpp @@ -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())); |