Revert "Introduced a token cache for the C++ editor."

This reverts commit c2393df02332618c8cf6159d9d6f6a40041ced89.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/libs/cplusplus/TokenUnderCursor.cpp b/src/libs/cplusplus/TokenUnderCursor.cpp
index c1b4b19247..5cbcdfc7a2 100644
--- a/src/libs/cplusplus/TokenUnderCursor.cpp
+++ b/src/libs/cplusplus/TokenUnderCursor.cpp
@@ -28,14 +28,12 @@
 **************************************************************************/
 
 #include "TokenUnderCursor.h"
-#include "TokenCache.h"
-#include "TokenCache.h"
+#include "BackwardsScanner.h"
 #include <Token.h>
 
 #include <QTextCursor>
 #include <QTextBlock>
 #include <climits>
-#include <QTextDocument>
 
 using namespace CPlusPlus;
 
@@ -45,13 +43,17 @@ TokenUnderCursor::TokenUnderCursor()
 TokenUnderCursor::~TokenUnderCursor()
 { }
 
-SimpleToken TokenUnderCursor::operator()(TokenCache *cache, const QTextCursor &cursor, QTextBlock *b)
+SimpleToken TokenUnderCursor::operator()(const QTextCursor &cursor, QTextBlock *b)
 {
+    SimpleLexer tokenize;
+    tokenize.setObjCEnabled(true);
+    tokenize.setSkipComments(false);
+
     QTextBlock block = cursor.block();
     int column = cursor.position() - cursor.block().position();
 
     _text = block.text();
-    _tokens = cache->tokensForBlock(block);
+    _tokens = tokenize(_text, BackwardsScanner::previousBlockState(block));
     for (int index = _tokens.size() - 1; index != -1; --index) {
         const SimpleToken &tk = _tokens.at(index);
         if (tk.position() < column) {