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

QMessageLogContext: rename and improve copy()

Browse Source 
The "copy" name led me to mis-believe that it was a workaround
to the class being non-copiable, and was missing copying a
data member.

This is instead deliberate; so rename the function to
"copyContextFrom", documenting that version won't be copied.
The function is still private API, so actually make it private;
QMessageLogContext already befriended the only user.

Finally, make it return *this (so that it can be chained,
if necessary) and noexcept.

Change-Id: I3deb3c8edc863a88ac0c37467b144ec2e20db5ca
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2019-05-14 19:24:13 +02:00 committed by Marc Mutz
parent a8162e1f59
commit 001ba40e19
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/corelib/global/qlogging.cpp
View File

@ -439,7 +439,7 @@ void QMessageLogger::debug(const QLoggingCategory &cat, const char *msg, ...) co
return;
QMessageLogContext ctxt;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
va_list ap;
@ -466,7 +466,7 @@ void QMessageLogger::debug(QMessageLogger::CategoryFunction catFunc,
return;
QMessageLogContext ctxt;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
va_list ap;
@ -489,7 +489,7 @@ QDebug QMessageLogger::debug() const
{
QDebug dbg = QDebug(QtDebugMsg);
QMessageLogContext &ctxt = dbg.stream->context;
ctxt.copy(context);
ctxt.copyContextFrom(context);
return dbg;
}
@ -506,7 +506,7 @@ QDebug QMessageLogger::debug(const QLoggingCategory &cat) const
dbg.stream->message_output = false;
QMessageLogContext &ctxt = dbg.stream->context;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
return dbg;
@ -550,7 +550,7 @@ void QMessageLogger::info(const QLoggingCategory &cat, const char *msg, ...) con
return;
QMessageLogContext ctxt;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
va_list ap;
@ -577,7 +577,7 @@ void QMessageLogger::info(QMessageLogger::CategoryFunction catFunc,
return;
QMessageLogContext ctxt;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
va_list ap;
@ -601,7 +601,7 @@ QDebug QMessageLogger::info() const
{
QDebug dbg = QDebug(QtInfoMsg);
QMessageLogContext &ctxt = dbg.stream->context;
ctxt.copy(context);
ctxt.copyContextFrom(context);
return dbg;
}
@ -618,7 +618,7 @@ QDebug QMessageLogger::info(const QLoggingCategory &cat) const
dbg.stream->message_output = false;
QMessageLogContext &ctxt = dbg.stream->context;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
return dbg;
@ -668,7 +668,7 @@ void QMessageLogger::warning(const QLoggingCategory &cat, const char *msg, ...)
return;
QMessageLogContext ctxt;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
va_list ap;
@ -695,7 +695,7 @@ void QMessageLogger::warning(QMessageLogger::CategoryFunction catFunc,
return;
QMessageLogContext ctxt;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
va_list ap;
@ -717,7 +717,7 @@ QDebug QMessageLogger::warning() const
{
QDebug dbg = QDebug(QtWarningMsg);
QMessageLogContext &ctxt = dbg.stream->context;
ctxt.copy(context);
ctxt.copyContextFrom(context);
return dbg;
}
@ -733,7 +733,7 @@ QDebug QMessageLogger::warning(const QLoggingCategory &cat) const
dbg.stream->message_output = false;
QMessageLogContext &ctxt = dbg.stream->context;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
return dbg;
@ -784,7 +784,7 @@ void QMessageLogger::critical(const QLoggingCategory &cat, const char *msg, ...)
return;
QMessageLogContext ctxt;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
va_list ap;
@ -811,7 +811,7 @@ void QMessageLogger::critical(QMessageLogger::CategoryFunction catFunc,
return;
QMessageLogContext ctxt;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
va_list ap;
@ -833,7 +833,7 @@ QDebug QMessageLogger::critical() const
{
QDebug dbg = QDebug(QtCriticalMsg);
QMessageLogContext &ctxt = dbg.stream->context;
ctxt.copy(context);
ctxt.copyContextFrom(context);
return dbg;
}
@ -850,7 +850,7 @@ QDebug QMessageLogger::critical(const QLoggingCategory &cat) const
dbg.stream->message_output = false;
QMessageLogContext &ctxt = dbg.stream->context;
ctxt.copy(context);
ctxt.copyContextFrom(context);
ctxt.category = cat.categoryName();
return dbg;
@ -2108,15 +2108,20 @@ void qSetMessagePattern(const QString &pattern)
/*!
Copies context information from \a logContext into this QMessageLogContext
Copies context information from \a logContext into this QMessageLogContext.
Returns a reference to this object.
Note that the version is \b not copied, only the context information.
\internal
*/
void QMessageLogContext::copy(const QMessageLogContext &logContext)
QMessageLogContext &QMessageLogContext::copyContextFrom(const QMessageLogContext &logContext) noexcept
{
this->category = logContext.category;
this->file = logContext.file;
this->line = logContext.line;
this->function = logContext.function;
return *this;
}
/*!

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

@ -68,8 +68,6 @@ public:
Q_DECL_CONSTEXPR QMessageLogContext(const char *fileName, int lineNumber, const char *functionName, const char *categoryName)
: version(2), line(lineNumber), file(fileName), function(functionName), category(categoryName) {}
void copy(const QMessageLogContext &logContext);
int version;
int line;
const char *file;
@ -77,6 +75,8 @@ public:
const char *category;
private:
QMessageLogContext &copyContextFrom(const QMessageLogContext &logContext) noexcept;
friend class QMessageLogger;
friend class QDebug;
};