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

C++: model-manager clean-ups.

Browse Source 
Change-Id: I59fdb898e270af0fcc18e79ae922e119504ef10e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2013-04-23 14:46:44 +02:00
committed by Nikolai Kosjar
parent 0c27b27658
commit ecacaab7a4
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -42,20 +42,13 @@
#include <QHash>
#include <QMutex>
#include <QTimer>
#include <QTextEdit> // for QTextEdit::ExtraSelection
namespace Core { class IEditor; }
namespace TextEditor {
class ITextEditor;
class BaseTextEditorWidget;
} // namespace TextEditor
namespace ProjectExplorer { class ProjectExplorerPlugin; }
namespace CPlusPlus { class ParseManager; }
namespace CppTools {
class CppCompletionSupportFactory;
@@ -64,7 +57,6 @@ class CppHighlightingSupportFactory;
namespace Internal {
class CppPreprocessor;
class CppFindReferences;
class CPPTOOLS_EXPORT CppModelManager : public CppTools::CppModelManagerInterface
@@ -149,8 +141,6 @@ public:
}
Q_SIGNALS:
void projectPathChanged(const QString &projectPath);
void aboutToRemoveFiles(const QStringList &files);
public Q_SLOTS:
@@ -181,10 +171,17 @@ private:
static CppModelManager *m_modelManagerInstance;
private:
// snapshot
mutable QMutex m_snapshotMutex;
CPlusPlus::Snapshot m_snapshot;
bool m_enableGC;
// cache
// project integration
mutable QMutex m_projectMutex;
QMap<ProjectExplorer::Project *, ProjectInfo> m_projects;
QMap<QString, QList<CppTools::ProjectPart::Ptr> > m_srcToProjectPart;
// cached/calculated from the projects and/or their project-parts
bool m_dirty;
QStringList m_projectFiles;
QStringList m_includePaths;
@@ -197,17 +194,9 @@ private:
QSet<AbstractEditorSupport *> m_addtionalEditorSupport;
// project integration
QMap<ProjectExplorer::Project *, ProjectInfo> m_projects;
mutable QMutex m_mutex;
mutable QMutex m_protectSnapshot;
CppFindReferences *m_findReferences;
bool m_indexerEnabled;
QMap<QString, QList<CppTools::ProjectPart::Ptr> > m_srcToProjectPart;
CppCompletionAssistProvider *m_completionAssistProvider;
CppCompletionAssistProvider *m_completionFallback;
CppHighlightingSupportFactory *m_highlightingFactory;