From f6e8ff07243b693dfc45bdeb4882e4f52f90930a Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 1 Sep 2010 09:46:18 +0200 Subject: Fix compiler warning in qtextformat.h When compiling with -Wshadow, function arguments that shadow a class member generate a warning. Change the name in the implementation of the new functions to avoid this warning. Reviewed-by: Samuel --- src/gui/text/qtextformat.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index 1de83bf..bb6e71d 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -638,11 +638,11 @@ inline void QTextListFormat::setStyle(Style astyle) inline void QTextListFormat::setIndent(int aindent) { setProperty(ListIndent, aindent); } -inline void QTextListFormat::setNumberPrefix(const QString &numberPrefix) -{ setProperty(ListNumberPrefix, numberPrefix); } +inline void QTextListFormat::setNumberPrefix(const QString &np) +{ setProperty(ListNumberPrefix, np); } -inline void QTextListFormat::setNumberSuffix(const QString &numberSuffix) -{ setProperty(ListNumberSuffix, numberSuffix); } +inline void QTextListFormat::setNumberSuffix(const QString &ns) +{ setProperty(ListNumberSuffix, ns); } class Q_GUI_EXPORT QTextImageFormat : public QTextCharFormat { -- cgit v0.12