From 475e7b12836b098ceb5990ddac2ac0c3427a9637 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 4 Mar 2019 11:48:02 +0100 Subject: [PATCH] FakeVim: Fix a deprecation warning ... and re-organize surrounding code a bit. Change-Id: I0c3af5b2a434c5088ed165fed97d562f468d16fc Reviewed-by: Christian Stenger --- src/plugins/fakevim/fakevimhandler.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 72e12aeb53b..e808848de9b 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -2155,6 +2155,7 @@ public: bool handleExWriteCommand(const ExCommand &cmd); bool handleExEchoCommand(const ExCommand &cmd); + void setTabSize(int tabSize); void setupCharClass(); int charClass(QChar c, bool simple) const; signed char m_charClass[256]; @@ -2686,17 +2687,22 @@ void FakeVimHandler::Private::ensureCursorVisible() void FakeVimHandler::Private::updateEditor() { - const int charWidth = QFontMetrics(EDITOR(font())).horizontalAdvance(' '); - EDITOR(setTabStopWidth(charWidth * config(ConfigTabStop).toInt())); + setTabSize(config(ConfigTabStop).toInt()); setupCharClass(); } +void FakeVimHandler::Private::setTabSize(int tabSize) +{ + const int charWidth = QFontMetrics(EDITOR(font())).horizontalAdvance(' '); + const int width = charWidth * tabSize; + EDITOR(setTabStopDistance(width)); +} + void FakeVimHandler::Private::restoreWidget(int tabSize) { //EDITOR(removeEventFilter(q)); //EDITOR(setReadOnly(m_wasReadOnly)); - const int charWidth = QFontMetrics(EDITOR(font())).horizontalAdvance(' '); - EDITOR(setTabStopWidth(charWidth * tabSize)); + setTabSize(tabSize); g.visualMode = NoVisualMode; // Force "ordinary" cursor. setThinCursor();