From 5740bd641063c3adb19783125d3931046dfd1213 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 29 Apr 2009 09:04:59 +0200 Subject: Made cpp file suffixes take effect after restart. In CppTools, keep cpp file settings in plugin and settings page via shared pointer and apply to mime DB in extensionsInitialized() (after CppEditor has loaded and registered the mime types). Task-number: 252299 --- src/plugins/cpptools/cpptoolsplugin.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp') diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 301935530d..cdfda4c24b 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -61,8 +61,10 @@ enum { debug = 0 }; CppToolsPlugin *CppToolsPlugin::m_instance = 0; -CppToolsPlugin::CppToolsPlugin() - : m_context(-1), m_modelManager(0) +CppToolsPlugin::CppToolsPlugin() : + m_context(-1), + m_modelManager(0), + m_fileSettings(new CppFileSettings) { m_instance = this; } @@ -91,7 +93,7 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) addAutoReleasedObject(new CppClassesFilter(m_modelManager, core->editorManager())); addAutoReleasedObject(new CppFunctionsFilter(m_modelManager, core->editorManager())); addAutoReleasedObject(new CompletionSettingsPage(m_completion)); - addAutoReleasedObject(new CppFileSettingsPage); + addAutoReleasedObject(new CppFileSettingsPage(m_fileSettings)); // Menus Core::ActionContainer *mtools = am->actionContainer(Core::Constants::M_TOOLS); @@ -127,6 +129,11 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) void CppToolsPlugin::extensionsInitialized() { + // The Cpp editor plugin, which is loaded later on, registers the Cpp mime types, + // so, apply settings here + m_fileSettings->fromSettings(Core::ICore::instance()->settings()); + if (!m_fileSettings->applySuffixesToMimeDB()) + qWarning("Unable to apply cpp suffixes to mime database (cpp mime types not found).\n"); } void CppToolsPlugin::shutdown() -- cgit v1.2.1