summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-09-01 07:46:18 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-09-01 08:05:05 (GMT)
commitf6e8ff07243b693dfc45bdeb4882e4f52f90930a (patch)
tree0b06782b100c5204a9065f57a77372df4bc9cc32 /src
parent2e6ad2872890c2cd7f305b2a11acbef9f446eb3e (diff)
downloadQt-f6e8ff07243b693dfc45bdeb4882e4f52f90930a.zip
Qt-f6e8ff07243b693dfc45bdeb4882e4f52f90930a.tar.gz
Qt-f6e8ff07243b693dfc45bdeb4882e4f52f90930a.tar.bz2
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
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qtextformat.h8
1 files 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
{