From e7b96347f144b33d0afbb914e47c8fbffb1ee5a4 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 24 Sep 2009 16:34:18 +0200
Subject: [PATCH] Revert "Introduced our own document revision."

This reverts commit 6b510cb487a0c2e26b42b1a61b315f6581d74b55.
---
 src/plugins/cppeditor/cppeditor.cpp | 15 +++------------
 src/plugins/cppeditor/cppeditor.h   | 13 +++++--------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 5dec7a8711..ba926cc81e 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -538,8 +538,6 @@ CPPEditor::CPPEditor(QWidget *parent)
 {
     qRegisterMetaType<SemanticInfo>("SemanticInfo");
 
-    m_revision = 0;
-
     m_semanticHighlighter = new SemanticHighlighter(this);
     m_semanticHighlighter->start();
 
@@ -902,8 +900,6 @@ void CPPEditor::onContentsChanged(int position, int charsRemoved, int charsAdded
     Q_UNUSED(position)
     Q_UNUSED(charsAdded)
 
-    ++m_revision;
-
     if (m_currentRenameSelection == -1)
         return;
 
@@ -1311,11 +1307,6 @@ Symbol *CPPEditor::findDefinition(Symbol *symbol)
     return 0;
 }
 
-unsigned CPPEditor::revision() const
-{
-    return m_revision;
-}
-
 SemanticInfo CPPEditor::semanticInfo() const
 {
     return m_lastSemanticInfo;
@@ -1780,7 +1771,7 @@ void CPPEditor::semanticRehighlight()
 
 void CPPEditor::updateSemanticInfo(const SemanticInfo &semanticInfo)
 {
-    if (semanticInfo.revision != m_revision) {
+    if (semanticInfo.revision != document()->revision()) {
         // got outdated semantic info
         semanticRehighlight();
         return;
@@ -1824,10 +1815,10 @@ SemanticHighlighter::Source CPPEditor::currentSource()
     const QString fileName = file()->fileName();
 
     QString code;
-    if (m_lastSemanticInfo.revision != m_revision)
+    if (m_lastSemanticInfo.revision != document()->revision())
         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,
                                              line, column, revision);
     return source;
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index e38cfcff71..cea326ffed 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -71,10 +71,10 @@ public:
         unsigned length;
 
         Use()
-            : line(0), column(0), length(0) {}
+                : line(0), column(0), length(0) {}
 
         Use(unsigned line, unsigned column, unsigned length)
-            : line(line), column(column), length(length) {}
+                : line(line), column(column), length(length) {}
     };
 
     typedef QHash<CPlusPlus::Symbol *, QList<Use> > LocalUseMap;
@@ -84,10 +84,10 @@ public:
     typedef QHashIterator<CPlusPlus::Identifier *, QList<Use> > ExternalUseIterator;
 
     SemanticInfo()
-        : revision(0)
+            : revision(-1)
     { }
 
-    unsigned revision;
+    int revision;
     CPlusPlus::Snapshot snapshot;
     CPlusPlus::Document::Ptr doc;
     LocalUseMap localUses;
@@ -114,7 +114,7 @@ public:
         int revision;
 
         Source()
-            : line(0), column(0), revision(0)
+                : line(0), column(0), revision(0)
         { }
 
         Source(const CPlusPlus::Snapshot &snapshot,
@@ -190,7 +190,6 @@ public:
     void indentInsertedText(const QTextCursor &tc);
 
     SemanticInfo semanticInfo() const;
-    unsigned revision() const;
 
 public Q_SLOTS:
     virtual void setFontSettings(const TextEditor::FontSettings &);
@@ -296,8 +295,6 @@ private:
 
     SemanticHighlighter *m_semanticHighlighter;
     SemanticInfo m_lastSemanticInfo;
-
-    unsigned m_revision;
 };
 
 
-- 
GitLab