diff --git a/src/characters/Hangul.h b/src/characters/Hangul.h index 7fbf6dbf6..0a8c45d4a 100644 --- a/src/characters/Hangul.h +++ b/src/characters/Hangul.h @@ -36,7 +36,7 @@ public: }; static int width(uint c, int widthFromTable, enum SyllablePos &syllablePos); - static bool combinesWith(Character prev, uint c); + static bool combinesWith(Character prevChar, uint c); static bool isHangul(const uint c) { diff --git a/src/filterHotSpots/UrlFilter.h b/src/filterHotSpots/UrlFilter.h index 1c9bdb542..073f4c9f6 100644 --- a/src/filterHotSpots/UrlFilter.h +++ b/src/filterHotSpots/UrlFilter.h @@ -21,7 +21,7 @@ class KONSOLEPRIVATE_EXPORT UrlFilter : public RegExpFilter public: UrlFilter(); - QSharedPointer newHotSpot(int beginRow, int beginColumn, int endRow, int endColumn, const QStringList &list) override; + QSharedPointer newHotSpot(int startLine, int startColumn, int endLine, int endColumn, const QStringList &capturedTexts) override; public: static const QRegularExpression FullUrlRegExp; diff --git a/src/history/compact/CompactHistoryScroll.h b/src/history/compact/CompactHistoryScroll.h index b08df9e65..d91b766b0 100644 --- a/src/history/compact/CompactHistoryScroll.h +++ b/src/history/compact/CompactHistoryScroll.h @@ -28,10 +28,10 @@ public: void getCells(const int lineNumber, const int startColumn, const int count, Character buffer[]) const override; bool isWrappedLine(const int lineNumber) const override; LineProperty getLineProperty(const int lineNumber) const override; - void setLineProperty(const int lineno, LineProperty prop) override; + void setLineProperty(const int lineNumber, LineProperty prop) override; void addCells(const Character a[], const int count) override; - void addCellsMove(Character a[], const int count) override; + void addCellsMove(Character characters[], const int count) override; void addLine(const LineProperty lineProperty = LineProperty()) override; void removeCells() override; diff --git a/src/ptyqt/conptyprocess.h b/src/ptyqt/conptyprocess.h index 0d310b192..1f0680832 100644 --- a/src/ptyqt/conptyprocess.h +++ b/src/ptyqt/conptyprocess.h @@ -147,7 +147,7 @@ public: ~ConPtyProcess(); bool - startProcess(const QString &shellPath, const QStringList &arguments, const QString &workingDirectory, QStringList environment, qint16 cols, qint16 rows); + startProcess(const QString &shellPath, const QStringList &arguments, const QString &workingDir, QStringList environment, qint16 cols, qint16 rows); bool resize(qint16 cols, qint16 rows); bool kill(); PtyType type();