Commit 9c5c59b5 authored by EXT Arnaud Clère's avatar EXT Arnaud Clère
Browse files

Applied naming rule

parent f22e7cb5
......@@ -117,8 +117,8 @@ protected:
const char * m_categoryName;
const QLoggingCategory& m_category;
QByteArray m_format;
QVector<QByteArray> m_arg_types;
QVector<QByteArray> m_arg_names;
QVector<QByteArray> m_argTypes;
QVector<QByteArray> m_argNames;
mutable int m_id;
mutable int m_count; // mutable allows making log() const
......
......@@ -107,8 +107,8 @@ private:
qint64 m_nsecsElapsed;
mutable QDateTime m_dateTime;
QVector<QSharedPointer<data::IBindable>> m_args;
QVector<QByteArray> m_arg_types;
QVector<QByteArray> m_arg_names;
QVector<QByteArray> m_argTypes;
QVector<QByteArray> m_argNames;
};
} // log
......
......@@ -69,8 +69,8 @@ void LogEvent::log(QByteArray format, QVector<QSharedPointer<data::IBindable>> a
if (!format.isNull()) {
m_format = format;
m_arg_types = argTypes;
m_arg_names = argNames;
m_argTypes = argTypes;
m_argNames = argNames;
}
LogEventData data(m_type, m_file, m_line, m_function, m_categoryName);
......@@ -78,8 +78,8 @@ void LogEvent::log(QByteArray format, QVector<QSharedPointer<data::IBindable>> a
data.setCount(m_count);
data.setFormat(m_format.constData());
data.setArgs(args);
data.setArgTypes(m_arg_types);
data.setArgNames(m_arg_names);
data.setArgTypes(m_argTypes);
data.setArgNames(m_argNames);
LogManager::getInstance().process(data);
++m_count;
......@@ -111,8 +111,8 @@ void LogSample::log(QByteArray format, QVector<QSharedPointer<data::IBindable>>
{
if (!format.isNull()) {
m_format = format;
m_arg_types = argTypes;
m_arg_names = argNames;
m_argTypes = argTypes;
m_argNames = argNames;
}
if (isSampled())
{
......@@ -124,8 +124,8 @@ void LogSample::log(QByteArray format, QVector<QSharedPointer<data::IBindable>>
data.setCount(m_count == m_lastCount+1 ? 0 : m_count);
data.setFormat(m_format.constData());
data.setArgs(args);
data.setArgTypes(m_arg_types);
data.setArgNames(m_arg_names);
data.setArgTypes(m_argTypes);
data.setArgNames(m_argNames);
LogManager::getInstance().process(data);
......
......@@ -110,12 +110,12 @@ const QVector<QSharedPointer<data::IBindable>>& LogEventData::args() const
const QVector<QByteArray>& LogEventData::argTypes() const
{
return m_arg_types;
return m_argTypes;
}
const QVector<QByteArray>& LogEventData::argNames() const
{
return m_arg_names;
return m_argNames;
}
const QDateTime& LogEventData::dateTime() const
......@@ -152,12 +152,12 @@ void LogEventData::setArgs(const QVector<QSharedPointer<data::IBindable>>& data)
void LogEventData::setArgTypes(const QVector<QByteArray>& data)
{
m_arg_types = data;
m_argTypes = data;
}
void LogEventData::setArgNames(const QVector<QByteArray>& data)
{
m_arg_names = data;
m_argNames = data;
}
void LogEventData::setNSecsElapsed(qint64 t)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment