diff options
author | hjk <qtc-committer@nokia.com> | 2010-06-25 17:37:59 +0200 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2010-06-25 17:38:25 +0200 |
commit | 2f5f358ff420bf4fa2fdc09d105463bd1e0e792f (patch) | |
tree | a826357ccde587a1cce12749ff5fbb0ae8ac6f79 /src/plugins/designer/formeditorw.cpp | |
parent | 2bdf10ce1077fc21f6a3835de1f103f87c75eebf (diff) | |
download | qt-creator-2f5f358ff420bf4fa2fdc09d105463bd1e0e792f.tar.gz |
Core::Context: compile hot fix for Windows.
Diffstat (limited to 'src/plugins/designer/formeditorw.cpp')
-rw-r--r-- | src/plugins/designer/formeditorw.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 492f0c420c..2103eb2792 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -46,7 +46,6 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <coreplugin/helpmanager.h> -#include <coreplugin/uniqueidmanager.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> @@ -174,8 +173,7 @@ FormEditorW::FormEditorW() : m_fwm = qobject_cast<qdesigner_internal::QDesignerFormWindowManager*>(m_formeditor->formWindowManager()); QTC_ASSERT(m_fwm, return); - Core::UniqueIDManager *idMan = Core::UniqueIDManager::instance(); - m_contexts << idMan->uniqueIdentifier(QLatin1String(Designer::Constants::C_FORMEDITOR)); + m_contexts.add(Designer::Constants::C_FORMEDITOR); setupActions(); @@ -331,11 +329,8 @@ void FormEditorW::fullInit() layout->addWidget(m_editorWidget); m_modeWidget->setLayout(layout); - Core::UniqueIDManager *idMan = Core::UniqueIDManager::instance(); - int editorManagerContext = idMan->uniqueIdentifier(QLatin1String(Core::Constants::C_EDITORMANAGER)); - Core::Context designerContexts = m_contexts; - designerContexts.append(Core::Context(editorManagerContext)); + designerContexts.add(Core::Constants::C_EDITORMANAGER); m_context = new DesignerContext(designerContexts, m_modeWidget, this); m_core->addContextObject(m_context); |