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

BlackBerry: Only add the Bar Descriptor category once to the taskhub

Browse Source 
Change-Id: Iaaa565559a38753bb08ef986557d2ca489e5e190
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Nätterlund
2013-04-30 12:59:17 +02:00
committed by Tobias Nätterlund
parent 9763e9e325
commit 8f3a8d47c1
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qnx/bardescriptoreditor.cpp
View File

@@ -49,7 +49,6 @@ using namespace Qnx::Internal;
BarDescriptorEditor::BarDescriptorEditor(BarDescriptorEditorWidget *editorWidget) BarDescriptorEditor::BarDescriptorEditor(BarDescriptorEditorWidget *editorWidget)
: Core::IEditor() : Core::IEditor()
, m_taskHub(0)
{ {
setWidget(editorWidget); setWidget(editorWidget);
@@ -166,12 +165,7 @@ void BarDescriptorEditor::changeEditorPage(QAction *action)
ProjectExplorer::TaskHub *BarDescriptorEditor::taskHub() ProjectExplorer::TaskHub *BarDescriptorEditor::taskHub()
{ {
if (m_taskHub == 0) { return ProjectExplorer::ProjectExplorerPlugin::instance()->taskHub();
m_taskHub = ProjectExplorer::ProjectExplorerPlugin::instance()->taskHub();
m_taskHub->addCategory(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR, tr("Bar Descriptor"));
}
return m_taskHub;
} }
void BarDescriptorEditor::setActivePage(BarDescriptorEditor::EditorPage page) void BarDescriptorEditor::setActivePage(BarDescriptorEditor::EditorPage page)

2
src/plugins/qnx/bardescriptoreditor.h
View File

@@ -96,8 +96,6 @@ private:
QToolBar *m_toolBar; QToolBar *m_toolBar;
QActionGroup *m_actionGroup; QActionGroup *m_actionGroup;
ProjectExplorer::TaskHub *m_taskHub;
}; };
} // namespace Internal } // namespace Internal

4
src/plugins/qnx/qnxplugin.cpp
View File

@@ -54,6 +54,8 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/taskhub.h>
#include <QtPlugin> #include <QtPlugin>
@@ -114,6 +116,8 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
void QNXPlugin::extensionsInitialized() void QNXPlugin::extensionsInitialized()
{ {
ProjectExplorer::ProjectExplorerPlugin::instance()->taskHub()->addCategory(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR,
tr("Bar Descriptor"));
} }
ExtensionSystem::IPlugin::ShutdownFlag QNXPlugin::aboutToShutdown() ExtensionSystem::IPlugin::ShutdownFlag QNXPlugin::aboutToShutdown()