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

4
src/plugins/texteditor/snippets/snippetscollection.cpp
View File

@@ -109,10 +109,10 @@ SnippetsCollection *SnippetsCollection::instance()
// SnippetsCollection
SnippetsCollection::SnippetsCollection() :
m_userSnippetsPath(Core::ICore::instance()->userResourcePath() + QLatin1String("/snippets/")),
m_userSnippetsPath(Core::ICore::userResourcePath() + QLatin1String("/snippets/")),
m_userSnippetsFile(QLatin1String("snippets.xml"))
{
QDir dir(Core::ICore::instance()->resourcePath() + QLatin1String("/snippets/"));
QDir dir(Core::ICore::resourcePath() + QLatin1String("/snippets/"));
dir.setNameFilters(QStringList(QLatin1String("*.xml")));
foreach (const QFileInfo &fi, dir.entryInfoList())
m_builtInSnippetsFiles.append(fi.absoluteFilePath());

6
src/plugins/texteditor/snippets/snippetssettingspage.cpp
View File

@@ -402,7 +402,7 @@ void SnippetsSettingsPagePrivate::apply()
if (SnippetsCollection::instance()->synchronize(&errorString))
m_snippetsCollectionChanged = false;
else
QMessageBox::critical(Core::ICore::instance()->mainWindow(),
QMessageBox::critical(Core::ICore::mainWindow(),
tr("Error While Saving Snippet Collection"), errorString);
}
}
@@ -422,7 +422,7 @@ void SnippetsSettingsPagePrivate::loadSettings()
if (m_ui.groupCombo->count() == 0)
return;
if (QSettings *s = Core::ICore::instance()->settings()) {
if (QSettings *s = Core::ICore::settings()) {
m_settings.fromSettings(m_settingsPrefix, s);
const QString &lastGroupName = m_settings.lastUsedSnippetGroup();
const int index = m_ui.groupCombo->findText(lastGroupName);
@@ -438,7 +438,7 @@ void SnippetsSettingsPagePrivate::writeSettings()
if (m_ui.groupCombo->count() == 0)
return;
if (QSettings *s = Core::ICore::instance()->settings()) {
if (QSettings *s = Core::ICore::settings()) {
m_settings.setLastUsedSnippetGroup(m_ui.groupCombo->currentText());
m_settings.toSettings(m_settingsPrefix, s);
}