From edcbb6a119cd92d43d235578a0cee6d6a3a5ad16 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 9 Oct 2009 11:06:40 +0200
Subject: [PATCH] Removed obsolete code.
---
src/plugins/cppeditor/cppeditor.cpp | 111 +---------------------------
src/plugins/cppeditor/cppeditor.h | 10 ---
2 files changed, 1 insertion(+), 120 deletions(-)
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 68885add66f..7c3778b5949 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -541,22 +541,7 @@ CPPEditor::CPPEditor(QWidget *parent)
setCodeFoldingVisible(true);
baseTextDocument()->setSyntaxHighlighter(new CppHighlighter);
-#ifdef WITH_TOKEN_MOVE_POSITION
- new QShortcut(QKeySequence::MoveToPreviousWord, this, SLOT(moveToPreviousToken()),
- /*ambiguousMember=*/ 0, Qt::WidgetShortcut);
-
- new QShortcut(QKeySequence::MoveToNextWord, this, SLOT(moveToNextToken()),
- /*ambiguousMember=*/ 0, Qt::WidgetShortcut);
-
- new QShortcut(QKeySequence::DeleteStartOfWord, this, SLOT(deleteStartOfToken()),
- /*ambiguousMember=*/ 0, Qt::WidgetShortcut);
-
- new QShortcut(QKeySequence::DeleteEndOfWord, this, SLOT(deleteEndOfToken()),
- /*ambiguousMember=*/ 0, Qt::WidgetShortcut);
-#endif
-
- m_modelManager = ExtensionSystem::PluginManager::instance()
- ->getObject<CppTools::CppModelManagerInterface>();
+ m_modelManager = CppTools::CppModelManagerInterface::instance();
if (m_modelManager) {
connect(m_modelManager, SIGNAL(documentUpdated(CPlusPlus::Document::Ptr)),
@@ -691,100 +676,6 @@ void CPPEditor::abortRename()
setExtraSelections(CodeSemanticsSelection, m_renameSelections);
}
-int CPPEditor::previousBlockState(QTextBlock block) const
-{
- block = block.previous();
- if (block.isValid()) {
- int state = block.userState();
-
- if (state != -1)
- return state;
- }
- return 0;
-}
-
-QTextCursor CPPEditor::moveToPreviousToken(QTextCursor::MoveMode mode) const
-{
- SimpleLexer tokenize;
- QTextCursor c(textCursor());
- QTextBlock block = c.block();
- int column = c.columnNumber();
-
- for (; block.isValid(); block = block.previous()) {
- const QString textBlock = block.text();
- QList<SimpleToken> tokens = tokenize(textBlock, previousBlockState(block));
-
- if (! tokens.isEmpty()) {
- tokens.prepend(SimpleToken());
-
- for (int index = tokens.size() - 1; index != -1; --index) {
- const SimpleToken &tk = tokens.at(index);
- if (tk.position() < column) {
- c.setPosition(block.position() + tk.position(), mode);
- return c;
- }
- }
- }
-
- column = INT_MAX;
- }
-
- c.movePosition(QTextCursor::Start, mode);
- return c;
-}
-
-QTextCursor CPPEditor::moveToNextToken(QTextCursor::MoveMode mode) const
-{
- SimpleLexer tokenize;
- QTextCursor c(textCursor());
- QTextBlock block = c.block();
- int column = c.columnNumber();
-
- for (; block.isValid(); block = block.next()) {
- const QString textBlock = block.text();
- QList<SimpleToken> tokens = tokenize(textBlock, previousBlockState(block));
-
- if (! tokens.isEmpty()) {
- for (int index = 0; index < tokens.size(); ++index) {
- const SimpleToken &tk = tokens.at(index);
- if (tk.position() > column) {
- c.setPosition(block.position() + tk.position(), mode);
- return c;
- }
- }
- }
-
- column = -1;
- }
-
- c.movePosition(QTextCursor::End, mode);
- return c;
-}
-
-void CPPEditor::moveToPreviousToken()
-{
- setTextCursor(moveToPreviousToken(QTextCursor::MoveAnchor));
-}
-
-void CPPEditor::moveToNextToken()
-{
- setTextCursor(moveToNextToken(QTextCursor::MoveAnchor));
-}
-
-void CPPEditor::deleteStartOfToken()
-{
- QTextCursor c = moveToPreviousToken(QTextCursor::KeepAnchor);
- c.removeSelectedText();
- setTextCursor(c);
-}
-
-void CPPEditor::deleteEndOfToken()
-{
- QTextCursor c = moveToNextToken(QTextCursor::KeepAnchor);
- c.removeSelectedText();
- setTextCursor(c);
-}
-
void CPPEditor::onDocumentUpdated(Document::Ptr doc)
{
if (doc->fileName() != file()->fileName())
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index b15e7d75551..0be089c8333 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -194,12 +194,6 @@ public Q_SLOTS:
void findUsages();
void renameUsagesNow();
- void moveToPreviousToken();
- void moveToNextToken();
-
- void deleteStartOfToken();
- void deleteEndOfToken();
-
protected:
bool event(QEvent *e);
void contextMenuEvent(QContextMenuEvent *);
@@ -245,10 +239,6 @@ private:
TextEditor::ITextEditor *openCppEditorAt(const QString &fileName, int line,
int column = 0);
- int previousBlockState(QTextBlock block) const;
- QTextCursor moveToPreviousToken(QTextCursor::MoveMode mode) const;
- QTextCursor moveToNextToken(QTextCursor::MoveMode mode) const;
-
SemanticHighlighter::Source currentSource();
void highlightUses(const QList<SemanticInfo::Use> &uses,
--
GitLab