diff options
| author | Mike Skec <skec@protonmail.ch> | 2021-02-13 14:34:00 +1100 |
|---|---|---|
| committer | Felix Queißner <felix@ib-queissner.de> | 2021-02-13 12:32:26 +0100 |
| commit | 49e78d5338e274a28b51b60776c903234d7046cc (patch) | |
| tree | 0502fe254c253389ca01c46618264c528a5ef863 /src | |
| parent | aeaa90c126b7f56cbbcf6b4ffe2f53db58292a33 (diff) | |
| download | kristall-49e78d5338e274a28b51b60776c903234d7046cc.tar.gz | |
renderhelpers: move global funcs to namespace
Diffstat (limited to 'src')
| -rw-r--r-- | src/renderers/gophermaprenderer.cpp | 2 | ||||
| -rw-r--r-- | src/renderers/plaintextrenderer.cpp | 2 | ||||
| -rw-r--r-- | src/renderers/renderhelpers.cpp | 13 | ||||
| -rw-r--r-- | src/renderers/renderhelpers.hpp | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/renderers/gophermaprenderer.cpp b/src/renderers/gophermaprenderer.cpp index 6e6deb1..e3422f4 100644 --- a/src/renderers/gophermaprenderer.cpp +++ b/src/renderers/gophermaprenderer.cpp @@ -141,7 +141,7 @@ std::unique_ptr<QTextDocument> GophermapRenderer::render(const QByteArray &input if (type == 'i') { const QString escapeRenderInput = title + "\n"; - RenderEscapeCodes(escapeRenderInput.toUtf8(), standard, cursor); + renderhelpers::renderEscapeCodes(escapeRenderInput.toUtf8(), standard, cursor); } else { diff --git a/src/renderers/plaintextrenderer.cpp b/src/renderers/plaintextrenderer.cpp index b183818..9592147 100644 --- a/src/renderers/plaintextrenderer.cpp +++ b/src/renderers/plaintextrenderer.cpp @@ -17,7 +17,7 @@ std::unique_ptr<QTextDocument> PlainTextRenderer::render(const QByteArray &input renderhelpers::setPageMargins(result.get(), style.margin_h, style.margin_v); QTextCursor cursor { result.get() }; - RenderEscapeCodes(input, standard, cursor); + renderhelpers::renderEscapeCodes(input, standard, cursor); return result; } diff --git a/src/renderers/renderhelpers.cpp b/src/renderers/renderhelpers.cpp index 6c5f2ef..6fc5bc9 100644 --- a/src/renderers/renderhelpers.cpp +++ b/src/renderers/renderhelpers.cpp @@ -23,7 +23,7 @@ static constexpr const char escapeString = '\033'; bool inverted{false}; -void setColor(QTextCharFormat& format, unsigned char n, bool bg=false) +static void setColor(QTextCharFormat& format, unsigned char n, bool bg=false) { QColor color; @@ -57,7 +57,7 @@ void setColor(QTextCharFormat& format, unsigned char n, bool bg=false) format.setForeground(color); } -QString parseNumber(const QString& input, QString::const_iterator& it) +static QString parseNumber(const QString& input, QString::const_iterator& it) { QString result; while (it != input.cend()) @@ -70,7 +70,7 @@ QString parseNumber(const QString& input, QString::const_iterator& it) return result; } -void parseSGR( +static void parseSGR( std::vector<unsigned char>& args, const QString& input, QString::const_iterator& it, @@ -223,7 +223,7 @@ void parseSGR( } } -std::vector<unsigned char> parseNumericArguments(const QString& input, QString::const_iterator& it) +static std::vector<unsigned char> parseNumericArguments(const QString& input, QString::const_iterator& it) { std::vector<unsigned char> result; while (it != input.end()) @@ -247,7 +247,7 @@ std::vector<unsigned char> parseNumericArguments(const QString& input, QString:: return result; } -void parseCSI( +static void parseCSI( const QString& input, QString::const_iterator& it, QTextCharFormat& format, @@ -324,7 +324,8 @@ void parseCSI( } } -void RenderEscapeCodes(const QByteArray &input, const QTextCharFormat& format, QTextCursor& cursor) +void renderhelpers::renderEscapeCodes(const QByteArray &input, + const QTextCharFormat& format, QTextCursor& cursor) { auto textFormat = format; const auto tokens = input.split(escapeString); diff --git a/src/renderers/renderhelpers.hpp b/src/renderers/renderhelpers.hpp index c5273c2..521ba92 100644 --- a/src/renderers/renderhelpers.hpp +++ b/src/renderers/renderhelpers.hpp @@ -5,10 +5,10 @@ #include <QTextCursor> #include <QTextDocument> -void RenderEscapeCodes(const QByteArray &input, const QTextCharFormat& format, QTextCursor& cursor); - namespace renderhelpers { + void renderEscapeCodes(const QByteArray &input, const QTextCharFormat& format, QTextCursor& cursor); + void setPageMargins(QTextDocument *doc, int mh, int mv); } |
