Fix compilation with -Werror -Wshadow

Change-Id: I2ef8f288415820fa08e5bab8b99a00b1ad0f2988
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h
index c6edc7b..5ac6cc0 100644 (file)
--- a/src/corelib/global/qlogging.h
+++ b/src/corelib/global/qlogging.h
@@ -67,8 +67,8 @@ class QMessageLogContext
     Q_DISABLE_COPY(QMessageLogContext)
 public:
     QMessageLogContext() : version(1), line(0), file(0), function(0) {}
-    Q_DECL_CONSTEXPR QMessageLogContext(const char *file, int line, const char *function)
-        : version(1), line(line), file(file), function(function) {}
+    Q_DECL_CONSTEXPR QMessageLogContext(const char *fileName, int lineNumber, const char *functionName)
+        : version(1), line(lineNumber), file(fileName), function(functionName) {}
 
     int version;
     int line;

diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index c301d92..1c3390b 100644 (file)
--- 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: