aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Humpula <michal.humpula@seznam.cz>2014-01-20 10:32:36 (GMT)
committerMichal Humpula <michal.humpula@seznam.cz>2014-01-20 10:32:36 (GMT)
commit9307fa13b968f664b96904e8b987e24a05b91065 (patch)
treed14bc093081d909b7b3d4d754bea5b9f1b4679f7
parenta57d0ee2465b764929fa5a01fb1cf44838500825 (diff)
remove vi specific parts from KateCmdLineEdit
-rw-r--r--src/view/kateviewhelpers.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/view/kateviewhelpers.cpp b/src/view/kateviewhelpers.cpp
index 7ae2a78..546ace5 100644
--- a/src/view/kateviewhelpers.cpp
+++ b/src/view/kateviewhelpers.cpp
@@ -38,7 +38,6 @@
#include "katelayoutcache.h"
#include "katetextlayout.h"
#include "kateglobal.h"
-#include "kateviglobal.h"
#include "katepartdebug.h"
#include <katevicommandrangeexpressionparser.h>
@@ -368,7 +367,7 @@ void KateScrollBar::updatePixmap()
m_pixmap.fill(QColor("transparent"));
// The text currently selected in the document, to be drawn later.
- const Range &selection = m_view->selectionRange();
+ const KTextEditor::Range &selection = m_view->selectionRange();
QPainter painter;
if (painter.begin(&m_pixmap)) {
@@ -423,7 +422,7 @@ void KateScrollBar::updatePixmap()
}
// Query the selection and draw it above the character with an alpha channel
- if (selection.contains(Cursor(realLineNumber, x))) {
+ if (selection.contains(KTextEditor::Cursor(realLineNumber, x))) {
painter.setPen(selectionColor);
painter.drawPoint(s_pixelMargin, pixelY);
// fill the line up in case the selection extends beyond it
@@ -938,10 +937,10 @@ void KateCmdLineEdit::slotReturnPressed(const QString &text)
if (text.isEmpty()) {
return;
}
- // silently ignore leading space characters and colon characters (for vi-heads)
+ // silently ignore leading space characters
uint n = 0;
const uint textlen = text.length();
- while ((n < textlen) && (text[n].isSpace() || text[n] == QLatin1Char(':'))) {
+ while ((n < textlen) && (text[n].isSpace())) {
n++;
}
@@ -1037,10 +1036,6 @@ void KateCmdLineEdit::slotReturnPressed(const QString &text)
if (isVisible()) {
m_hideTimer->start(4000);
}
-
- if (m_view->viInputMode()) {
- m_view->getViInputModeManager()->reset();
- }
}
void KateCmdLineEdit::hideLineEdit() // unless i have focus ;)