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

2
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -97,7 +97,7 @@ QString QmlProject::filesFileName() const
void QmlProject::parseProject(RefreshOptions options)
{
Core::MessageManager *messageManager = Core::ICore::instance()->messageManager();
Core::MessageManager *messageManager = Core::ICore::messageManager();
if (options & Files) {
if (options & ProjectFile)
delete m_projectItem.data();

5
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

@@ -72,8 +72,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
{
using namespace Core;
ICore *core = ICore::instance();
Core::MimeDatabase *mimeDB = core->mimeDatabase();
Core::MimeDatabase *mimeDB = Core::ICore::mimeDatabase();
const QLatin1String mimetypesXml(":/qmlproject/QmlProject.mimetypes.xml");
@@ -116,7 +115,7 @@ void QmlProjectPlugin::showQmlObserverToolWarning()
"and click Rebuild."));
dialog.exec();
if (dialog.clickedButton() == qtPref) {
Core::ICore::instance()->showOptionsDialog(
Core::ICore::showOptionsDialog(
ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID);
}

2
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -331,7 +331,7 @@ void QmlProjectRunConfiguration::updateEnabled()
bool qmlFileFound = false;
if (mainScriptSource() == FileInEditor) {
Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
Core::MimeDatabase *db = ICore::instance()->mimeDatabase();
Core::MimeDatabase *db = ICore::mimeDatabase();
if (editor) {
m_currentFileFilename = editor->file()->fileName();
if (db->findByFile(mainScript()).type() == QLatin1String("application/x-qml"))

3
src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
View File

@@ -269,8 +269,7 @@ void QmlProjectRunConfigurationWidget::qmlDebugServerPortChanged(uint port)
void QmlProjectRunConfigurationWidget::manageQtVersions()
{
ICore *core = ICore::instance();
core->showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
ICore::showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID);
}