summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-04-06 14:25:39 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-08 02:01:39 +0200
commit08fa879cd2fa64f5ef0d1435bb001195e1e18893 (patch)
tree570b41af97e749f6c806d74de9bb5ef26b48339a
parent70b892e3af457de0159646afa482c6d15014dac8 (diff)
Fix a warning in qtdocgallery found by GCC 4.8
qgalleryproperty.h:88:64: error: declaration of ‘regExp’ shadows a member of 'this' [-Werror=shadow] Change-Id: If33df1baac7e10edf015fbecab42fc13bde26434 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
-rw-r--r--src/gallery/qgalleryproperty.h8
1 files 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 &regExp) const {
- return QGalleryMetaDataFilter(QLatin1String(m_name), regExp, QGalleryFilter::RegExp); }
- QGalleryMetaDataFilter regExp(const QRegExp &regExp) 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); }