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

replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance()

Browse Source
This commit is contained in:
hjk
2009-01-20 11:52:04 +01:00
parent d1dac15cc5
commit 113b81e9db
85 changed files with 432 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -316,8 +316,8 @@ void NavigationWidget::objectAdded(QObject * obj)
if (!factory)
return;
Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
Core::ActionManager *am = core->actionManager();
ICore *core = ICore::instance();
ActionManager *am = core->actionManager();
QList<int> navicontext = QList<int>() << core->uniqueIDManager()->
uniqueIdentifier(Core::Constants::C_NAVIGATION_PANE);
@@ -399,9 +399,8 @@ NavigationSubWidget::~NavigationSubWidget()
void NavigationSubWidget::setCurrentIndex(int index)
{
// Remove toolbutton
foreach (QWidget *w, m_additionalToolBarWidgets) {
foreach (QWidget *w, m_additionalToolBarWidgets)
delete w;
}
// Remove old Widget
delete m_navigationWidget;
@@ -466,8 +465,7 @@ void NavigationSubWidget::setFactory(INavigationWidgetFactory *factory)
void NavigationSubWidget::setFactory(const QString &name)
{
for (int i = 0; i < m_navigationComboBox->count(); ++i)
{
for (int i = 0; i < m_navigationComboBox->count(); ++i) {
INavigationWidgetFactory *factory =
m_navigationComboBox->itemData(i).value<INavigationWidgetFactory *>();
if (factory->displayName() == name)