From 27ef2148e8b42e26e9a413481c76a655e6f6d1a1 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Wed, 8 Dec 2021 22:34:18 +0500 Subject: [PATCH] Inline EscapeSequenceUrlExtractor::appendUrlText --- src/EscapeSequenceUrlExtractor.cpp | 12 ++---------- src/EscapeSequenceUrlExtractor.h | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/EscapeSequenceUrlExtractor.cpp b/src/EscapeSequenceUrlExtractor.cpp index 56819702..22253de4 100644 --- a/src/EscapeSequenceUrlExtractor.cpp +++ b/src/EscapeSequenceUrlExtractor.cpp @@ -6,6 +6,7 @@ */ #include "EscapeSequenceUrlExtractor.h" +#include "Screen.h" #include @@ -19,22 +20,13 @@ void Konsole::EscapeSequenceUrlExtractor::setScreen(Konsole::Screen *screen) clear(); } -bool EscapeSequenceUrlExtractor::reading() const -{ - return _reading; -} - void EscapeSequenceUrlExtractor::beginUrlInput() { _reading = true; } -void EscapeSequenceUrlExtractor::appendUrlText(QChar c) +void EscapeSequenceUrlExtractor::appendUrlText_impl(QChar c) { - if (!reading()) { - return; - } - if (_currentUrl.text.isEmpty()) { // We need to on getCursorX because we want the position of the // last printed character, not the cursor. diff --git a/src/EscapeSequenceUrlExtractor.h b/src/EscapeSequenceUrlExtractor.h index 182f0901..7c3627a2 100644 --- a/src/EscapeSequenceUrlExtractor.h +++ b/src/EscapeSequenceUrlExtractor.h @@ -8,12 +8,12 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "Screen.h" #include #include namespace Konsole { +class Screen; /* Like QPoint, but with Row / Col * easier to read than x / y */ @@ -64,6 +64,8 @@ private: /* Pointer to the Screen, that actually holds the text data. */ Screen *_screen; + void appendUrlText_impl(QChar c); + public: /* This needs to have access to the Session * calculate the row / col of the current URL. @@ -78,7 +80,10 @@ public: void setScreen(Screen *screen); /* If we are parsing a URL */ - bool reading() const; + bool reading() const + { + return _reading; + } /* We found an URL, starting to parse */ void beginUrlInput(); @@ -91,7 +96,13 @@ public: /* The URL is parsed at once, but not the text. We received * one character per time until we hit the end byte. */ - void appendUrlText(QChar c); + void appendUrlText(QChar c) + { + if (!reading()) { + return; + } + appendUrlText_impl(c); + } /* The URL is parsed at once, store it at once. */ void setUrl(const QString &url);