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

CppTools: Rename SnapshotUpdater to BuiltinEditorDocumentParser

Browse Source 
Change-Id: I554b5e9e3f1ef7c167fa45b5cd0c230fdf63073b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-08-19 15:46:50 +02:00
committed by Erik Verbruggen
parent 7e71a299ef
commit 7d35212f60
14 changed files with 84 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cpptools/cpptoolseditorsupport.h
View File

@@ -30,10 +30,10 @@
#ifndef CPPTOOLSEDITORSUPPORT_H
#define CPPTOOLSEDITORSUPPORT_H
#include "builtineditordocumentparser.h"
#include "cpphighlightingsupport.h"
#include "cppmodelmanager.h"
#include "cppsemanticinfo.h"
#include "cppsnapshotupdater.h"
#include <cplusplus/Control.h>
#include <cplusplus/CppDocument.h>
@@ -133,7 +133,7 @@ public:
CppCompletionAssistProvider *completionAssistProvider() const;
QSharedPointer<SnapshotUpdater> snapshotUpdater();
QSharedPointer<BuiltinEditorDocumentParser> documentParser();
/// Checks whether the document is (re)parsed or about to be (re)parsed.
bool isUpdatingDocument();
@@ -202,8 +202,8 @@ private:
SemanticInfo semanticInfo() const;
void setSemanticInfo(const SemanticInfo &semanticInfo, bool emitSignal = true);
QSharedPointer<SnapshotUpdater> snapshotUpdater_internal() const;
void setSnapshotUpdater_internal(const QSharedPointer<SnapshotUpdater> &updater);
QSharedPointer<BuiltinEditorDocumentParser> documentParser_internal() const;
void setDocumentParser_internal(const QSharedPointer<BuiltinEditorDocumentParser> &updater);
private:
Internal::CppModelManager *m_modelManager;
@@ -212,7 +212,6 @@ private:
QTimer *m_updateDocumentTimer;
int m_updateDocumentInterval;
unsigned m_revision;
QFuture<void> m_documentParser;
QTimer *m_editorGCTimer;
bool m_editorVisible;
@@ -234,8 +233,9 @@ private:
mutable QMutex m_lastSemanticInfoLock;
SemanticInfo m_lastSemanticInfo;
QFuture<void> m_futureSemanticInfo;
mutable QMutex m_snapshotUpdaterLock;
QSharedPointer<SnapshotUpdater> m_snapshotUpdater;
mutable QMutex m_documentParserLock;
QSharedPointer<BuiltinEditorDocumentParser> m_documentParser;
QFuture<void> m_documentParserFuture;
// Highlighting:
unsigned m_lastHighlightRevision;