summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpptoolsplugin.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2013-08-23 15:07:19 +0200
committerErik Verbruggen <erik.verbruggen@digia.com>2013-08-30 16:42:26 +0200
commitfc731a3a673b5e2992bf90e01bca2913bbece0cd (patch)
treed48be851fbb2170e795b8845dc9ea8b855733cec /src/plugins/cpptools/cpptoolsplugin.cpp
parentde1ec224244bbfbf0faccc100168a418a2054515 (diff)
downloadqt-creator-fc731a3a673b5e2992bf90e01bca2913bbece0cd.tar.gz
CppTools: Introduce LocatorData
Until now the locator filters CppLocatorFilter, CppClassesFilter and CppFunctionsFilter used unnecessarily their own SearchSymbols instance. The results were also saved separately, which was unfavorable since e.g. the functions and classes data could be shared. Starting with this patch an instance of LocatorData will serve all mentioned filters. This saves about 20MB of memory after indexing the Qt Creator project. Change-Id: I8a34b67eb9fe0e5c68ba6e7c8f576389c78efc6f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
-rw-r--r--src/plugins/cpptools/cpptoolsplugin.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index be08a9afff..f73b0444ca 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -40,6 +40,7 @@
#include "cpptoolssettings.h"
#include "cpptoolsreuse.h"
#include "cppprojectfile.h"
+#include "cpplocatordata.h"
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
@@ -101,9 +102,11 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
connect(Core::DocumentManager::instance(), SIGNAL(filesChangedInternally(QStringList)),
modelManager, SLOT(updateSourceFiles(QStringList)));
- addAutoReleasedObject(new CppLocatorFilter(modelManager));
- addAutoReleasedObject(new CppClassesFilter(modelManager));
- addAutoReleasedObject(new CppFunctionsFilter(modelManager));
+ CppLocatorData *locatorData = new CppLocatorData(modelManager);
+ addAutoReleasedObject(locatorData);
+ addAutoReleasedObject(new CppLocatorFilter(locatorData));
+ addAutoReleasedObject(new CppClassesFilter(locatorData));
+ addAutoReleasedObject(new CppFunctionsFilter(locatorData));
addAutoReleasedObject(new CppCurrentDocumentFilter(modelManager));
addAutoReleasedObject(new CppFileSettingsPage(m_fileSettings));
addAutoReleasedObject(new SymbolsFindFilter(modelManager));