diff --git a/src/libs/cplusplus/BackwardsScanner.cpp b/src/libs/cplusplus/BackwardsScanner.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..df2916a6d757f1249a9ba61f2431f90ff5fedd32
--- /dev/null
+++ b/src/libs/cplusplus/BackwardsScanner.cpp
@@ -0,0 +1,105 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+#include "BackwardsScanner.h"
+#include <QtGui/QTextCursor>
+
+using namespace CPlusPlus;
+
+BackwardsScanner::BackwardsScanner(const QTextCursor &cursor, int maxBlockCount)
+ : _offset(0)
+ , _blocksTokenized(0)
+ , _block(cursor.block())
+ , _maxBlockCount(maxBlockCount)
+{
+ _tokenize.setSkipComments(true);
+ _text = _block.text().left(cursor.position() - cursor.block().position());
+ _tokens.append(_tokenize(_text, previousBlockState(_block)));
+}
+
+QList<SimpleToken> BackwardsScanner::tokens() const
+{ return _tokens; }
+
+const SimpleToken &BackwardsScanner::operator[](int i)
+{
+ while (_offset + i < 0) {
+ _block = _block.previous();
+ if (_blocksTokenized == _maxBlockCount || !_block.isValid()) {
+ ++_offset;
+ _tokens.prepend(SimpleToken()); // sentinel
+ break;
+ } else {
+ ++_blocksTokenized;
+
+ QString blockText = _block.text();
+ _text.prepend(blockText);
+ QList<SimpleToken> adaptedTokens;
+ for (int i = 0; i < _tokens.size(); ++i) {
+ const SimpleToken &t = _tokens.at(i);
+ const int position = t.position() + blockText.length();
+ adaptedTokens.append(SimpleToken(t.kind(),
+ position,
+ t.length(),
+ _text.midRef(position, t.length())));
+ }
+
+ _tokens = _tokenize(blockText, previousBlockState(_block));
+ _offset += _tokens.size();
+ _tokens += adaptedTokens;
+ }
+ }
+
+ return _tokens.at(_offset + i);
+}
+
+int BackwardsScanner::startPosition() const
+{ return _block.position(); }
+
+const QString &BackwardsScanner::text() const
+{ return _text; }
+
+QString BackwardsScanner::text(int begin, int end) const
+{
+ const SimpleToken &firstToken = _tokens.at(begin + _offset);
+ const SimpleToken &lastToken = _tokens.at(end + _offset - 1);
+ return _text.mid(firstToken.begin(), lastToken.end() - firstToken.begin());
+}
+
+int BackwardsScanner::previousBlockState(const QTextBlock &block)
+{
+ const QTextBlock prevBlock = block.previous();
+
+ if (prevBlock.isValid()) {
+ int state = prevBlock.userState();
+
+ if (state != -1)
+ return state;
+ }
+
+ return 0;
+}
diff --git a/src/libs/cplusplus/BackwardsScanner.h b/src/libs/cplusplus/BackwardsScanner.h
new file mode 100644
index 0000000000000000000000000000000000000000..c38060040bc3e62d9047bebde8b8d0b321f28913
--- /dev/null
+++ b/src/libs/cplusplus/BackwardsScanner.h
@@ -0,0 +1,66 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+#ifndef BACKWARDSSCANNER_H
+#define BACKWARDSSCANNER_H
+
+#include "SimpleLexer.h"
+
+#include <QtGui/QTextCursor>
+#include <QtGui/QTextBlock>
+
+namespace CPlusPlus {
+
+class CPLUSPLUS_EXPORT BackwardsScanner
+{
+ enum { MAX_BLOCK_COUNT = 10 };
+
+public:
+ BackwardsScanner(const QTextCursor &cursor, int maxBlockCount = MAX_BLOCK_COUNT);
+
+ QList<SimpleToken> tokens() const;
+ int startPosition() const;
+ const QString &text() const;
+
+ const SimpleToken &operator[](int i);
+ QString text(int begin, int end) const;
+ int previousBlockState(const QTextBlock &block);
+
+private:
+ QList<SimpleToken> _tokens;
+ int _offset;
+ int _blocksTokenized;
+ QTextBlock _block;
+ QString _text;
+ SimpleLexer _tokenize;
+ int _maxBlockCount;
+};
+
+} // end of namespace CPlusPlus
+
+#endif // BACKWARDSSCANNER_H
diff --git a/src/libs/cplusplus/ExpressionUnderCursor.cpp b/src/libs/cplusplus/ExpressionUnderCursor.cpp
index b51026b58573a699855257d07907f171b0466c36..1cc546de2265068f5919ab932468e2699eeacb5f 100644
--- a/src/libs/cplusplus/ExpressionUnderCursor.cpp
+++ b/src/libs/cplusplus/ExpressionUnderCursor.cpp
@@ -29,6 +29,7 @@
#include "ExpressionUnderCursor.h"
#include "SimpleLexer.h"
+#include "BackwardsScanner.h"
#include <Token.h>
#include <QTextCursor>
@@ -36,93 +37,6 @@
using namespace CPlusPlus;
-namespace CPlusPlus {
-
-class BackwardsScanner
-{
- enum { MAX_BLOCK_COUNT = 10 };
-
-public:
- BackwardsScanner(const QTextCursor &cursor)
- : _offset(0)
- , _blocksTokenized(0)
- , _block(cursor.block())
- {
- _tokenize.setSkipComments(true);
- _text = _block.text().left(cursor.position() - cursor.block().position());
- _tokens.append(_tokenize(_text, previousBlockState(_block)));
- }
-
- QList<SimpleToken> tokens() const { return _tokens; }
-
- const SimpleToken &operator[](int i)
- {
- while (_offset + i < 0) {
- _block = _block.previous();
- if (_blocksTokenized == MAX_BLOCK_COUNT || !_block.isValid()) {
- ++_offset;
- _tokens.prepend(SimpleToken()); // sentinel
- break;
- } else {
- ++_blocksTokenized;
-
- QString blockText = _block.text();
- _text.prepend(blockText);
- QList<SimpleToken> adaptedTokens;
- for (int i = 0; i < _tokens.size(); ++i) {
- const SimpleToken &t = _tokens.at(i);
- const int position = t.position() + blockText.length();
- adaptedTokens.append(SimpleToken(t.kind(),
- position,
- t.length(),
- _text.midRef(position, t.length())));
- }
-
- _tokens = _tokenize(blockText, previousBlockState(_block));
- _offset += _tokens.size();
- _tokens += adaptedTokens;
- }
- }
-
- return _tokens.at(_offset + i);
- }
-
- int startPosition() const
- { return _block.position(); }
-
- const QString &text() const
- { return _text; }
-
- QString text(int begin, int end) const
- {
- const SimpleToken &firstToken = _tokens.at(begin + _offset);
- const SimpleToken &lastToken = _tokens.at(end + _offset - 1);
- return _text.mid(firstToken.begin(), lastToken.end() - firstToken.begin());
- }
-
- int previousBlockState(const QTextBlock &block)
- {
- const QTextBlock prevBlock = block.previous();
- if (prevBlock.isValid()) {
- int state = prevBlock.userState();
-
- if (state != -1)
- return state;
- }
- return 0;
- }
-
-private:
- QList<SimpleToken> _tokens;
- int _offset;
- int _blocksTokenized;
- QTextBlock _block;
- QString _text;
- SimpleLexer _tokenize;
-};
-
-}
-
ExpressionUnderCursor::ExpressionUnderCursor()
{ }
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index 1df5e996951160f6336bbdd9499ee2c692fd422b..1cc2bd08e10666da9451b4efa2a723194a02fce5 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -8,12 +8,14 @@ HEADERS += \
$$PWD/Icons.h \
$$PWD/ExpressionUnderCursor.h \
$$PWD/TokenUnderCursor.h \
+ $$PWD/BackwardsScanner.h \
$$PWD/OverviewModel.h
SOURCES += \
$$PWD/Icons.cpp \
$$PWD/ExpressionUnderCursor.cpp \
$$PWD/TokenUnderCursor.cpp \
+ $$PWD/BackwardsScanner.cpp \
$$PWD/OverviewModel.cpp
}