qiurui
/
qtcoap
mirror of https://github.com/qt/qtcoap.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up logging categories 

Declare those used in multiple translation units in a central header,
and make those that are used in a single translation unit static.

Change-Id: I4cd440cf5b4520a3df2df2aa1d49d7a708ef1fdc
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
Volker Hilsheimer 2024-07-31 10:22:12 +02:00
parent de04005f9e
commit 41b71d6187
10 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/coap/quickmulticastclient/qmlcoapmulticastclient.cpp
View File

@ -6,7 +6,7 @@
#include <QCoapResourceDiscoveryReply>
#include <QLoggingCategory>
Q_LOGGING_CATEGORY(lcCoapClient, "qt.coap.client")
Q_STATIC_LOGGING_CATEGORY(lcCoapClient, "qt.coap.client")
//! [ctor]
QmlCoapMulticastClient::QmlCoapMulticastClient(QObject *parent)

2
examples/coap/quicksecureclient/qmlcoapsecureclient.cpp
View File

@ -10,7 +10,7 @@
#include <QMetaEnum>
#include <QUrl>
Q_LOGGING_CATEGORY(lcCoapClient, "qt.coap.client")
Q_STATIC_LOGGING_CATEGORY(lcCoapClient, "qt.coap.client")
QmlCoapSecureClient::QmlCoapSecureClient(QObject *parent)
: QObject(parent)

2
src/coap/qcoapclient.cpp
View File

@ -18,7 +18,7 @@
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcCoapClient, "qt.coap.client")
Q_STATIC_LOGGING_CATEGORY(lcCoapClient, "qt.coap.client")
QCoapClientPrivate::QCoapClientPrivate(QCoapProtocol *protocol, QCoapConnection *connection)
: protocol(protocol)

2
src/coap/qcoapinternalrequest.cpp
View File

@ -13,8 +13,6 @@
QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcCoapExchange)
/*!
\internal

4
src/coap/qcoapnamespace.h
View File

@ -5,12 +5,16 @@
#include <QtCoap/qcoapglobal.h>
#include <QtCore/qobject.h>
#include <QtCore/qrandom.h>
#include <QtCore/qloggingcategory.h>
#ifndef QCOAPNAMESPACE_H
#define QCOAPNAMESPACE_H
QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcCoapExchange)
Q_DECLARE_LOGGING_CATEGORY(lcCoapConnection)
#define FOR_EACH_COAP_ERROR(X) \
X(BadRequest, 0x80) X(Unauthorized, 0x81) X(BadOption, 0x82) X(Forbidden, 0x83) \
X(NotFound, 0x84) X(MethodNotAllowed, 0x85) X(NotAcceptable, 0x86) \

2
src/coap/qcoapoption.cpp
View File

@ -9,7 +9,7 @@
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcCoapOption, "qt.coap.option")
Q_STATIC_LOGGING_CATEGORY(lcCoapOption, "qt.coap.option")
/*!
\class QCoapOption

2
src/coap/qcoapprotocol.cpp
View File

@ -16,7 +16,7 @@
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcCoapProtocol, "qt.coap.protocol")
Q_STATIC_LOGGING_CATEGORY(lcCoapProtocol, "qt.coap.protocol")
/*!
\internal

2
src/coap/qcoapqudpconnection.cpp
View File

@ -16,8 +16,6 @@
QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcCoapConnection)
/*!
\internal

2
src/coap/qcoapreply.cpp
View File

@ -11,8 +11,6 @@
QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcCoapExchange)
/*!
\internal
Constructor.

2
src/coap/qcoaprequest.cpp
View File

@ -11,8 +11,6 @@
QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcCoapExchange)
namespace {
const auto CoapScheme = QLatin1String("coap");
const auto CoapSecureScheme = QLatin1String("coaps");