From 08fa879cd2fa64f5ef0d1435bb001195e1e18893 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 6 Apr 2013 14:25:39 -0700 Subject: Fix a warning in qtdocgallery found by GCC 4.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qgalleryproperty.h:88:64: error: declaration of ‘regExp’ shadows a member of 'this' [-Werror=shadow] Change-Id: If33df1baac7e10edf015fbecab42fc13bde26434 Reviewed-by: Laszlo Papp Reviewed-by: Andrew den Exter --- src/gallery/qgalleryproperty.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallery/qgalleryproperty.h b/src/gallery/qgalleryproperty.h index 1373ae0..a4fbbad 100644 --- a/src/gallery/qgalleryproperty.h +++ b/src/gallery/qgalleryproperty.h @@ -85,10 +85,10 @@ struct Q_GALLERY_EXPORT QGalleryProperty return QGalleryMetaDataFilter(QLatin1String(m_name), string, QGalleryFilter::EndsWith); } QGalleryMetaDataFilter wildcard(const QString &string) const { return QGalleryMetaDataFilter(QLatin1String(m_name), string, QGalleryFilter::Wildcard); } - QGalleryMetaDataFilter regExp(const QString ®Exp) const { - return QGalleryMetaDataFilter(QLatin1String(m_name), regExp, QGalleryFilter::RegExp); } - QGalleryMetaDataFilter regExp(const QRegExp ®Exp) const { - return QGalleryMetaDataFilter(QLatin1String(m_name), regExp, QGalleryFilter::RegExp); } + QGalleryMetaDataFilter regExp(const QString &rx) const { + return QGalleryMetaDataFilter(QLatin1String(m_name), rx, QGalleryFilter::RegExp); } + QGalleryMetaDataFilter regExp(const QRegExp &rx) const { + return QGalleryMetaDataFilter(QLatin1String(m_name), rx, QGalleryFilter::RegExp); } QString ascending() const { return QLatin1Char('+') + QLatin1String(m_name); } QString descending() const { return QLatin1Char('-') + QLatin1String(m_name); } -- cgit v1.2.3