diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2012-10-15 16:38:56 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2012-10-16 16:13:43 +0200 |
| commit | b6608da7d1f67c6d110396d1e170ee26abf5ce46 (patch) | |
| tree | 43268853297c699b892005d5646ceb695ccf387f /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | 826a90ba132e339a520c0722ce0912f7b2a1af1c (diff) | |
| download | qt-creator-b6608da7d1f67c6d110396d1e170ee26abf5ce46.tar.gz | |
C++: changed the CppModelManager to use a normal singleton.
Also removed two TODOs.
Change-Id: I91b235795da7e87a21782d189844eacdd68c5f3c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index d1742ea51e..8c9b35d893 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -86,7 +86,6 @@ static CppToolsPlugin *m_instance = 0; static QHash<QString, QString> m_headerSourceMapping; CppToolsPlugin::CppToolsPlugin() : - m_modelManager(0), m_fileSettings(new CppFileSettings) { m_instance = this; @@ -95,7 +94,7 @@ CppToolsPlugin::CppToolsPlugin() : CppToolsPlugin::~CppToolsPlugin() { m_instance = 0; - m_modelManager = 0; // deleted automatically + delete CppModelManager::instance(); } bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) @@ -106,20 +105,19 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) m_settings = new CppToolsSettings(this); // force registration of cpp tools settings // Objects - m_modelManager = new CppModelManager(this); + CppModelManager *modelManager = CppModelManager::instance(); Core::VcsManager *vcsManager = Core::ICore::vcsManager(); connect(vcsManager, SIGNAL(repositoryChanged(QString)), - m_modelManager, SLOT(updateModifiedSourceFiles())); + modelManager, SLOT(updateModifiedSourceFiles())); connect(Core::DocumentManager::instance(), SIGNAL(filesChangedInternally(QStringList)), - m_modelManager, SLOT(updateSourceFiles(QStringList))); - addAutoReleasedObject(m_modelManager); + modelManager, SLOT(updateSourceFiles(QStringList))); - addAutoReleasedObject(new CppLocatorFilter(m_modelManager)); - addAutoReleasedObject(new CppClassesFilter(m_modelManager)); - addAutoReleasedObject(new CppFunctionsFilter(m_modelManager)); - addAutoReleasedObject(new CppCurrentDocumentFilter(m_modelManager, Core::ICore::editorManager())); + addAutoReleasedObject(new CppLocatorFilter(modelManager)); + addAutoReleasedObject(new CppClassesFilter(modelManager)); + addAutoReleasedObject(new CppFunctionsFilter(modelManager)); + addAutoReleasedObject(new CppCurrentDocumentFilter(modelManager, Core::ICore::editorManager())); addAutoReleasedObject(new CppFileSettingsPage(m_fileSettings)); - addAutoReleasedObject(new SymbolsFindFilter(m_modelManager)); + addAutoReleasedObject(new SymbolsFindFilter(modelManager)); addAutoReleasedObject(new CppCodeStyleSettingsPage); // Menus |