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

Make PluginManager mostly static.

Browse Source 
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Eike Ziller
2012-06-18 11:34:15 +02:00
committed by hjk
parent 9daa34003d
commit e3c354d8f2
88 changed files with 287 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/texteditor/texteditorsettings.cpp
View File

@@ -111,8 +111,6 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
QTC_ASSERT(!m_instance, return);
m_instance = this;
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
// Note: default background colors are coming from FormatDescription::background()
// Add font preference page
@@ -196,7 +194,7 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
m_d->m_fontSettingsPage = new FontSettingsPage(formatDescriptions,
QLatin1String(Constants::TEXT_EDITOR_FONT_SETTINGS),
this);
pm->addObject(m_d->m_fontSettingsPage);
ExtensionSystem::PluginManager::addObject(m_d->m_fontSettingsPage);
// Add the GUI used to configure the tab, storage and interaction settings
TextEditor::BehaviorSettingsPageParameters behaviorSettingsPageParameters;
@@ -204,22 +202,22 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
behaviorSettingsPageParameters.displayName = tr("Behavior");
behaviorSettingsPageParameters.settingsPrefix = QLatin1String("text");
m_d->m_behaviorSettingsPage = new BehaviorSettingsPage(behaviorSettingsPageParameters, this);
pm->addObject(m_d->m_behaviorSettingsPage);
ExtensionSystem::PluginManager::addObject(m_d->m_behaviorSettingsPage);
TextEditor::DisplaySettingsPageParameters displaySettingsPageParameters;
displaySettingsPageParameters.id = QLatin1String(Constants::TEXT_EDITOR_DISPLAY_SETTINGS),
displaySettingsPageParameters.displayName = tr("Display");
displaySettingsPageParameters.settingsPrefix = QLatin1String("text");
m_d->m_displaySettingsPage = new DisplaySettingsPage(displaySettingsPageParameters, this);
pm->addObject(m_d->m_displaySettingsPage);
ExtensionSystem::PluginManager::addObject(m_d->m_displaySettingsPage);
m_d->m_highlighterSettingsPage =
new HighlighterSettingsPage(QLatin1String(Constants::TEXT_EDITOR_HIGHLIGHTER_SETTINGS), this);
pm->addObject(m_d->m_highlighterSettingsPage);
ExtensionSystem::PluginManager::addObject(m_d->m_highlighterSettingsPage);
m_d->m_snippetsSettingsPage =
new SnippetsSettingsPage(QLatin1String(Constants::TEXT_EDITOR_SNIPPETS_SETTINGS), this);
pm->addObject(m_d->m_snippetsSettingsPage);
ExtensionSystem::PluginManager::addObject(m_d->m_snippetsSettingsPage);
connect(m_d->m_fontSettingsPage, SIGNAL(changed(TextEditor::FontSettings)),
this, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)));
@@ -239,12 +237,11 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
TextEditorSettings::~TextEditorSettings()
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
pm->removeObject(m_d->m_fontSettingsPage);
pm->removeObject(m_d->m_behaviorSettingsPage);
pm->removeObject(m_d->m_displaySettingsPage);
pm->removeObject(m_d->m_highlighterSettingsPage);
pm->removeObject(m_d->m_snippetsSettingsPage);
ExtensionSystem::PluginManager::removeObject(m_d->m_fontSettingsPage);
ExtensionSystem::PluginManager::removeObject(m_d->m_behaviorSettingsPage);
ExtensionSystem::PluginManager::removeObject(m_d->m_displaySettingsPage);
ExtensionSystem::PluginManager::removeObject(m_d->m_highlighterSettingsPage);
ExtensionSystem::PluginManager::removeObject(m_d->m_snippetsSettingsPage);
delete m_d;