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

Use new static ICore interface.

Browse Source 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
hjk
2012-01-24 15:36:40 +01:00
committed by hjk
parent c14a4756a9
commit 4a21f0c3c8
254 changed files with 848 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/welcome/welcomeplugin.cpp
View File

@@ -177,7 +177,7 @@ bool WelcomeMode::eventFilter(QObject *, QEvent *e)
WelcomeMode::~WelcomeMode()
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->setValue(QLatin1String(currentPageSettingsKeyC), activePlugin());
delete m_modeWidget;
}
@@ -193,7 +193,7 @@ void WelcomeMode::facilitateQml(QDeclarativeEngine * /*engine*/)
void WelcomeMode::initPlugins()
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
setActivePlugin(settings->value(QLatin1String(currentPageSettingsKeyC)).toInt());
// TODO: re-enable reading from Settings when possible. See QTCREATORBUG-6803
@@ -227,7 +227,7 @@ void WelcomeMode::initPlugins()
// finally, load the root page
m_welcomePage->setSource(
QUrl::fromLocalFile(Core::ICore::instance()->resourcePath() + QLatin1String("/welcomescreen/welcomescreen.qml")));
QUrl::fromLocalFile(Core::ICore::resourcePath() + QLatin1String("/welcomescreen/welcomescreen.qml")));
}
QString WelcomeMode::platform() const
@@ -270,7 +270,7 @@ void WelcomeMode::sendFeedback()
void WelcomeMode::newProject()
{
Core::ICore::instance()->showNewItemDialog(tr("New Project"),
Core::ICore::showNewItemDialog(tr("New Project"),
Core::IWizard::wizardsOfKind(Core::IWizard::ProjectWizard));
}
@@ -286,8 +286,8 @@ void WelcomeMode::modeChanged(Core::IMode *mode)
// Eike doesn't like this, but I do...
// ProjectExplorer::ProjectExplorerPlugin *projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
// Core::ModeManager *modeManager = Core::ICore::instance()->modeManager();
// Core::EditorManager *editorManager = Core::ICore::instance()->editorManager();
// Core::ModeManager *modeManager = Core::ICore::modeManager();
// Core::EditorManager *editorManager = Core::ICore::editorManager();
// if (mode->id() == id() && (!projectExplorer->currentProject() && editorManager->openedEditors().isEmpty()))
// modeManager->setModeBarHidden(true);
// else