diff options
| author | David Faure <faure@kde.org> | 2012-02-07 20:42:37 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 12:37:06 +0100 |
| commit | 0a8671fe502396e7c527dd82c3ec2e9daa4bf513 (patch) | |
| tree | 43f2c4cc5c78f3c0235913ab3e93e9fb859ff3a6 /src/corelib/io | |
| parent | 43a6739beb19d33aa1b0b2920bc2fe2c0356194a (diff) | |
Fix compilation with -Werror -Wshadow
Change-Id: I2ef8f288415820fa08e5bab8b99a00b1ad0f2988
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qurl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index c301d92dfb..1c3390bc3d 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -211,10 +211,10 @@ public: QString errorString() const; #if QT_DEPRECATED_SINCE(5,0) - QT_DEPRECATED void setEncodedUrl(const QByteArray &url, ParsingMode mode = TolerantMode) - { setUrl(QString::fromUtf8(url.constData(), url.size()), mode); } - QT_DEPRECATED static QUrl fromEncoded(const QByteArray &url, ParsingMode mode = TolerantMode) - { return QUrl(QString::fromUtf8(url.constData(), url.size()), mode); } + QT_DEPRECATED void setEncodedUrl(const QByteArray &u, ParsingMode mode = TolerantMode) + { setUrl(QString::fromUtf8(u.constData(), u.size()), mode); } + QT_DEPRECATED static QUrl fromEncoded(const QByteArray &u, ParsingMode mode = TolerantMode) + { return QUrl(QString::fromUtf8(u.constData(), u.size()), mode); } #endif private: |