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/global | |
| parent | 43a6739beb19d33aa1b0b2920bc2fe2c0356194a (diff) | |
Fix compilation with -Werror -Wshadow
Change-Id: I2ef8f288415820fa08e5bab8b99a00b1ad0f2988
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qlogging.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index c6edc7bc48..5ac6cc090e 100644 --- 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; |