Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: mark internal KWordMacroExpander and KCharMacroExpander reimplementations as final

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-09-23 19:16:22 +03:00
parent 39e687084e
commit a08c91ab3c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kdecore/util/kmacroexpander.h
View file

@ -225,9 +225,9 @@ public:
protected: protected:
/** \internal Not to be called or reimplemented. */ /** \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. */ /** \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. * Return substitution list @p ret for string macro @p str.
@ -261,9 +261,9 @@ public:
protected: protected:
/** \internal Not to be called or reimplemented. */ /** \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. */ /** \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. * Return substitution list @p ret for single-character macro @p chr.

4
kio/kio/krun.cpp
View file

@ -181,7 +181,7 @@ public:
bool hasUrls: 1, hasSpec: 1; bool hasUrls: 1, hasSpec: 1;
protected: protected:
virtual int expandEscapedMacro(const QString &str, int pos, QStringList &ret); int expandEscapedMacro(const QString &str, int pos, QStringList &ret) final;
private: private:
const KService &service; const KService &service;
@ -234,7 +234,7 @@ public:
bool ignFile: 1; bool ignFile: 1;
protected: protected:
virtual int expandEscapedMacro(const QString &str, int pos, QStringList &ret); int expandEscapedMacro(const QString &str, int pos, QStringList &ret) final;
private: private:
void subst(int option, const KUrl &url, QStringList &ret); void subst(int option, const KUrl &url, QStringList &ret);