AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation with -Werror -Wshadow

Browse Source 
Change-Id: I2ef8f288415820fa08e5bab8b99a00b1ad0f2988
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
David Faure 2012-02-07 20:42:37 +01:00 committed by Qt by Nokia
parent 43a6739beb
commit 0a8671fe50
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qlogging.h
View File

@ -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;

8
src/corelib/io/qurl.h
View File

@ -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: