diff options
| author | hjk <qtc-committer@nokia.com> | 2012-03-07 16:40:03 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-03-12 10:58:47 +0100 |
| commit | 4516c41ce31ca3d5756c6f44542fe34153bb487f (patch) | |
| tree | dae210c9dacf2e3a1548256fe55738c29a09267f /src/plugins/qmljseditor | |
| parent | 97c8781f404ae2020facfa7b82a522f71ec655a6 (diff) | |
| download | qt-creator-4516c41ce31ca3d5756c6f44542fe34153bb487f.tar.gz | |
taskhub: use more direct access.
Change-Id: Ibc4f37589f913ff9ea0025156979ddda73929e38
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/qmljseditor')
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditorplugin.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmltaskmanager.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 6795134d62..357f0dd4af 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -64,7 +64,7 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/editormanager/editormanager.h> #include <projectexplorer/taskhub.h> -#include <extensionsystem/pluginmanager.h> +#include <projectexplorer/projectexplorer.h> #include <texteditor/texteditorconstants.h> #include <texteditor/texteditorsettings.h> #include <texteditor/textfilewizard.h> @@ -84,6 +84,7 @@ using namespace QmlJSEditor; using namespace QmlJSEditor::Internal; using namespace QmlJSEditor::Constants; +using namespace ProjectExplorer; enum { QUICKFIX_INTERVAL = 20 @@ -266,8 +267,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e void QmlJSEditorPlugin::extensionsInitialized() { - ProjectExplorer::TaskHub *taskHub = - ExtensionSystem::PluginManager::instance()->getObject<ProjectExplorer::TaskHub>(); + TaskHub *taskHub = ProjectExplorerPlugin::instance()->taskHub(); taskHub->addCategory(Constants::TASK_CATEGORY_QML, tr("QML")); taskHub->addCategory(Constants::TASK_CATEGORY_QML_ANALYSIS, tr("QML Analysis"), false); } @@ -380,7 +380,7 @@ void QmlJSEditorPlugin::currentEditorChanged(Core::IEditor *editor) void QmlJSEditorPlugin::runSemanticScan() { m_qmlTaskManager->updateSemanticMessagesNow(); - ProjectExplorer::TaskHub *hub = ExtensionSystem::PluginManager::instance()->getObject<ProjectExplorer::TaskHub>(); + TaskHub *hub = ProjectExplorerPlugin::instance()->taskHub(); hub->setCategoryVisibility(Constants::TASK_CATEGORY_QML_ANALYSIS, true); hub->popup(false); } diff --git a/src/plugins/qmljseditor/qmltaskmanager.cpp b/src/plugins/qmljseditor/qmltaskmanager.cpp index 4a238d5b8d..ed4e636af1 100644 --- a/src/plugins/qmljseditor/qmltaskmanager.cpp +++ b/src/plugins/qmljseditor/qmltaskmanager.cpp @@ -34,7 +34,7 @@ #include "qmljseditorconstants.h" #include <coreplugin/idocument.h> -#include <extensionsystem/pluginmanager.h> +#include <projectexplorer/projectexplorer.h> #include <projectexplorer/taskhub.h> #include <qmljs/qmljsmodelmanagerinterface.h> #include <qmljs/qmljscontext.h> @@ -57,7 +57,7 @@ QmlTaskManager::QmlTaskManager(QObject *parent) : m_taskHub(0), m_updatingSemantic(false) { - m_taskHub = ExtensionSystem::PluginManager::instance()->getObject<ProjectExplorer::TaskHub>(); + m_taskHub = ProjectExplorer::ProjectExplorerPlugin::instance()->taskHub(); // displaying results incrementally leads to flickering // connect(&m_messageCollector, SIGNAL(resultsReadyAt(int,int)), |