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

Revert "Introduced our own document revision."

Browse Source 
This reverts commit 6b510cb487.
This commit is contained in:
Roberto Raggi
2009-09-24 16:34:18 +02:00
parent 7d72996fa3
commit e7b96347f1
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -538,8 +538,6 @@ CPPEditor::CPPEditor(QWidget *parent)
{ {
qRegisterMetaType<SemanticInfo>("SemanticInfo"); qRegisterMetaType<SemanticInfo>("SemanticInfo");
m_revision = 0;
m_semanticHighlighter = new SemanticHighlighter(this); m_semanticHighlighter = new SemanticHighlighter(this);
m_semanticHighlighter->start(); m_semanticHighlighter->start();
@@ -902,8 +900,6 @@ void CPPEditor::onContentsChanged(int position, int charsRemoved, int charsAdded
Q_UNUSED(position) Q_UNUSED(position)
Q_UNUSED(charsAdded) Q_UNUSED(charsAdded)
++m_revision;
if (m_currentRenameSelection == -1) if (m_currentRenameSelection == -1)
return; return;
@@ -1311,11 +1307,6 @@ Symbol *CPPEditor::findDefinition(Symbol *symbol)
return 0; return 0;
} }
unsigned CPPEditor::revision() const
{
return m_revision;
}
SemanticInfo CPPEditor::semanticInfo() const SemanticInfo CPPEditor::semanticInfo() const
{ {
return m_lastSemanticInfo; return m_lastSemanticInfo;
@@ -1780,7 +1771,7 @@ void CPPEditor::semanticRehighlight()
void CPPEditor::updateSemanticInfo(const SemanticInfo &semanticInfo) void CPPEditor::updateSemanticInfo(const SemanticInfo &semanticInfo)
{ {
if (semanticInfo.revision != m_revision) { if (semanticInfo.revision != document()->revision()) {
// got outdated semantic info // got outdated semantic info
semanticRehighlight(); semanticRehighlight();
return; return;
@@ -1824,10 +1815,10 @@ SemanticHighlighter::Source CPPEditor::currentSource()
const QString fileName = file()->fileName(); const QString fileName = file()->fileName();
QString code; QString code;
if (m_lastSemanticInfo.revision != m_revision) if (m_lastSemanticInfo.revision != document()->revision())
code = toPlainText(); // get the source code only when needed. code = toPlainText(); // get the source code only when needed.
const int revision = m_revision; const int revision = document()->revision();
const SemanticHighlighter::Source source(snapshot, fileName, code, const SemanticHighlighter::Source source(snapshot, fileName, code,
line, column, revision); line, column, revision);
return source; return source;

7
src/plugins/cppeditor/cppeditor.h
View File

@@ -84,10 +84,10 @@ public:
typedef QHashIterator<CPlusPlus::Identifier *, QList<Use> > ExternalUseIterator; typedef QHashIterator<CPlusPlus::Identifier *, QList<Use> > ExternalUseIterator;
SemanticInfo() SemanticInfo()
: revision(0) : revision(-1)
{ } { }
unsigned revision; int revision;
CPlusPlus::Snapshot snapshot; CPlusPlus::Snapshot snapshot;
CPlusPlus::Document::Ptr doc; CPlusPlus::Document::Ptr doc;
LocalUseMap localUses; LocalUseMap localUses;
@@ -190,7 +190,6 @@ public:
void indentInsertedText(const QTextCursor &tc); void indentInsertedText(const QTextCursor &tc);
SemanticInfo semanticInfo() const; SemanticInfo semanticInfo() const;
unsigned revision() const;
public Q_SLOTS: public Q_SLOTS:
virtual void setFontSettings(const TextEditor::FontSettings &); virtual void setFontSettings(const TextEditor::FontSettings &);
@@ -296,8 +295,6 @@ private:
SemanticHighlighter *m_semanticHighlighter; SemanticHighlighter *m_semanticHighlighter;
SemanticInfo m_lastSemanticInfo; SemanticInfo m_lastSemanticInfo;
unsigned m_revision;
}; };