From a08c91ab3c3132290ac59f60e81eae37c8b2dcf8 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 23 Sep 2022 19:16:22 +0300 Subject: [PATCH] kdecore: mark internal KWordMacroExpander and KCharMacroExpander reimplementations as final Signed-off-by: Ivailo Monev --- kdecore/util/kmacroexpander.h | 8 ++++---- kio/kio/krun.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kdecore/util/kmacroexpander.h b/kdecore/util/kmacroexpander.h index 8b9a1bb1..76aef7be 100644 --- a/kdecore/util/kmacroexpander.h +++ b/kdecore/util/kmacroexpander.h @@ -225,9 +225,9 @@ public: protected: /** \internal Not to be called or reimplemented. */ - virtual int expandPlainMacro( const QString &str, int pos, QStringList &ret ); + int expandPlainMacro( const QString &str, int pos, QStringList &ret ) final; /** \internal Not to be called or reimplemented. */ - virtual int expandEscapedMacro( const QString &str, int pos, QStringList &ret ); + int expandEscapedMacro( const QString &str, int pos, QStringList &ret ) final; /** * Return substitution list @p ret for string macro @p str. @@ -261,9 +261,9 @@ public: protected: /** \internal Not to be called or reimplemented. */ - virtual int expandPlainMacro( const QString &str, int pos, QStringList &ret ); + int expandPlainMacro( const QString &str, int pos, QStringList &ret ) final; /** \internal Not to be called or reimplemented. */ - virtual int expandEscapedMacro( const QString &str, int pos, QStringList &ret ); + int expandEscapedMacro( const QString &str, int pos, QStringList &ret ) final; /** * Return substitution list @p ret for single-character macro @p chr. diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index 4c9c1edb..dcfbcd0f 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -181,7 +181,7 @@ public: bool hasUrls: 1, hasSpec: 1; protected: - virtual int expandEscapedMacro(const QString &str, int pos, QStringList &ret); + int expandEscapedMacro(const QString &str, int pos, QStringList &ret) final; private: const KService &service; @@ -234,7 +234,7 @@ public: bool ignFile: 1; protected: - virtual int expandEscapedMacro(const QString &str, int pos, QStringList &ret); + int expandEscapedMacro(const QString &str, int pos, QStringList &ret) final; private: void subst(int option, const KUrl &url, QStringList &ret);