diff options
| author | Kaloyan Chehlarski <kaloyan.chehlarski@qt.io> | 2024-06-27 13:16:23 +0200 |
|---|---|---|
| committer | Kaloyan Chehlarski <kaloyan.chehlarski@qt.io> | 2024-07-02 14:04:30 +0000 |
| commit | bd6e209152d042a08fc226a9e92ee1c04cf1954a (patch) | |
| tree | 433914a0c9a8c1030a1550e9fae49c87380abdfd | |
| parent | 841aa01aaf83c63ffd83bafe7509c17b6d36d467 (diff) | |
Use static logging categories everywhere
Following fa4bd30caa079a3b1e5eac1bb4f17365f456b8f9
all usage of the Q_LOGGING_CATEGORY macro triggers a deprecation
warning, and may even block certain build configurations. This change
replaces all usages of the macro with Q_STATIC_LOGGING_CATEGORY instead,
since none of the logging categories in WebEngine are meant to
be exported to users.
Change-Id: Icdebb7a3a8c987db3f34945cd0311aee52667a88
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
22 files changed, 21 insertions, 23 deletions
diff --git a/examples/pdfwidgets/pdfviewer/mainwindow.cpp b/examples/pdfwidgets/pdfviewer/mainwindow.cpp index ce19359fc..8525a360e 100644 --- a/examples/pdfwidgets/pdfviewer/mainwindow.cpp +++ b/examples/pdfwidgets/pdfviewer/mainwindow.cpp @@ -21,7 +21,7 @@ const qreal zoomMultiplier = qSqrt(2.0); -Q_LOGGING_CATEGORY(lcExample, "qt.examples.pdfviewer") +Q_STATIC_LOGGING_CATEGORY(lcExample, "qt.examples.pdfviewer") MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) diff --git a/examples/pdfwidgets/pdfviewer/mainwindow.h b/examples/pdfwidgets/pdfviewer/mainwindow.h index 7f5a5dbca..009e3c1e0 100644 --- a/examples/pdfwidgets/pdfviewer/mainwindow.h +++ b/examples/pdfwidgets/pdfviewer/mainwindow.h @@ -7,8 +7,6 @@ #include <QLoggingCategory> #include <QMainWindow> -Q_DECLARE_LOGGING_CATEGORY(lcExample) - QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; diff --git a/src/core/renderer_host/web_channel_ipc_transport_host.cpp b/src/core/renderer_host/web_channel_ipc_transport_host.cpp index 0824ed56d..531051777 100644 --- a/src/core/renderer_host/web_channel_ipc_transport_host.cpp +++ b/src/core/renderer_host/web_channel_ipc_transport_host.cpp @@ -17,7 +17,7 @@ namespace QtWebEngineCore { -Q_LOGGING_CATEGORY(log, "qt.webengine.webchanneltransport") +Q_STATIC_LOGGING_CATEGORY(log, "qt.webengine.webchanneltransport") inline QDebug operator<<(QDebug stream, content::RenderFrameHost *frame) { diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 3141102d5..84002f098 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -128,7 +128,7 @@ QT_END_NAMESPACE namespace QtWebEngineCore { -Q_LOGGING_CATEGORY(webEngineContextLog, "qt.webenginecontext") +Q_STATIC_LOGGING_CATEGORY(webEngineContextLog, "qt.webenginecontext") class GPUInfo { diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index e71153899..e64415faa 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -36,7 +36,7 @@ using namespace QtWebEngineCore; -Q_LOGGING_CATEGORY(webEngineLibraryInfoLog, "qt.webengine.libraryinfo") +Q_STATIC_LOGGING_CATEGORY(webEngineLibraryInfoLog, "qt.webengine.libraryinfo") namespace { diff --git a/src/pdf/plugins/imageformats/pdf/qpdfiohandler.cpp b/src/pdf/plugins/imageformats/pdf/qpdfiohandler.cpp index bb3e7c929..b3757d8fe 100644 --- a/src/pdf/plugins/imageformats/pdf/qpdfiohandler.cpp +++ b/src/pdf/plugins/imageformats/pdf/qpdfiohandler.cpp @@ -8,7 +8,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcPdf, "qt.imageformat.pdf") +Q_STATIC_LOGGING_CATEGORY(qLcPdf, "qt.imageformat.pdf") QPdfIOHandler::QPdfIOHandler() { diff --git a/src/pdf/qpdfbookmarkmodel.cpp b/src/pdf/qpdfbookmarkmodel.cpp index 93dbf5d1f..f4b30eeb6 100644 --- a/src/pdf/qpdfbookmarkmodel.cpp +++ b/src/pdf/qpdfbookmarkmodel.cpp @@ -17,7 +17,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcBM, "qt.pdf.bookmarks") +Q_STATIC_LOGGING_CATEGORY(qLcBM, "qt.pdf.bookmarks") class BookmarkNode { diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp index 17fdb29b9..be5d4b7ad 100644 --- a/src/pdf/qpdfdocument.cpp +++ b/src/pdf/qpdfdocument.cpp @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QRecursiveMutex, pdfMutex) static int libraryRefCount; static const double CharacterHitTolerance = 16.0; -Q_LOGGING_CATEGORY(qLcDoc, "qt.pdf.document") +Q_STATIC_LOGGING_CATEGORY(qLcDoc, "qt.pdf.document") QPdfMutexLocker::QPdfMutexLocker() : std::unique_lock<QRecursiveMutex>(*pdfMutex()) diff --git a/src/pdf/qpdflinkmodel.cpp b/src/pdf/qpdflinkmodel.cpp index 0a8b1e812..8eb710eaf 100644 --- a/src/pdf/qpdflinkmodel.cpp +++ b/src/pdf/qpdflinkmodel.cpp @@ -14,7 +14,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcLink, "qt.pdf.links") +Q_STATIC_LOGGING_CATEGORY(qLcLink, "qt.pdf.links") /*! \class QPdfLinkModel diff --git a/src/pdf/qpdfpagenavigator.cpp b/src/pdf/qpdfpagenavigator.cpp index e077e2184..80e4dfc83 100644 --- a/src/pdf/qpdfpagenavigator.cpp +++ b/src/pdf/qpdfpagenavigator.cpp @@ -10,7 +10,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcNav, "qt.pdf.pagenavigator") +Q_STATIC_LOGGING_CATEGORY(qLcNav, "qt.pdf.pagenavigator") struct QPdfPageNavigatorPrivate { diff --git a/src/pdf/qpdfsearchmodel.cpp b/src/pdf/qpdfsearchmodel.cpp index a81ae77dc..0764c5e6d 100644 --- a/src/pdf/qpdfsearchmodel.cpp +++ b/src/pdf/qpdfsearchmodel.cpp @@ -15,7 +15,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcS, "qt.pdf.search") +Q_STATIC_LOGGING_CATEGORY(qLcS, "qt.pdf.search") static const int UpdateTimerInterval = 100; static const int ContextChars = 64; diff --git a/src/pdfquick/qquickpdfpageimage.cpp b/src/pdfquick/qquickpdfpageimage.cpp index 9ff0337a5..fa805c50b 100644 --- a/src/pdfquick/qquickpdfpageimage.cpp +++ b/src/pdfquick/qquickpdfpageimage.cpp @@ -8,7 +8,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcImg, "qt.pdf.image") +Q_STATIC_LOGGING_CATEGORY(qLcImg, "qt.pdf.image") /*! \qmltype PdfPageImage diff --git a/src/pdfquick/qquickpdfsearchmodel.cpp b/src/pdfquick/qquickpdfsearchmodel.cpp index 896584ad7..50f447367 100644 --- a/src/pdfquick/qquickpdfsearchmodel.cpp +++ b/src/pdfquick/qquickpdfsearchmodel.cpp @@ -6,7 +6,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcSearch, "qt.pdf.search") +Q_STATIC_LOGGING_CATEGORY(qLcSearch, "qt.pdf.search") /*! \qmltype PdfSearchModel diff --git a/src/pdfquick/qquickpdfselection.cpp b/src/pdfquick/qquickpdfselection.cpp index 5a9aa0025..37163c36d 100644 --- a/src/pdfquick/qquickpdfselection.cpp +++ b/src/pdfquick/qquickpdfselection.cpp @@ -12,7 +12,7 @@ #include <QStandardPaths> #include <QtPdf/private/qpdfdocument_p.h> -Q_LOGGING_CATEGORY(qLcIm, "qt.pdf.im") +Q_STATIC_LOGGING_CATEGORY(qLcIm, "qt.pdf.im") QT_BEGIN_NAMESPACE diff --git a/src/pdfwidgets/qpdfview.cpp b/src/pdfwidgets/qpdfview.cpp index a19b77a7f..851cad980 100644 --- a/src/pdfwidgets/qpdfview.cpp +++ b/src/pdfwidgets/qpdfview.cpp @@ -19,7 +19,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcWLink, "qt.pdf.widgets.links") +Q_STATIC_LOGGING_CATEGORY(qLcWLink, "qt.pdf.widgets.links") //#define DEBUG_LINKS static const QColor SearchResultHighlight("#80B0C4DE"); diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp index 06af1123e..634943e30 100644 --- a/tests/auto/core/origins/tst_origins.cpp +++ b/tests/auto/core/origins/tst_origins.cpp @@ -25,7 +25,7 @@ #define QSL QStringLiteral #define QBAL QByteArrayLiteral -Q_LOGGING_CATEGORY(lc, "qt.webengine.tests") +Q_STATIC_LOGGING_CATEGORY(lc, "qt.webengine.tests") void registerSchemes() { diff --git a/tests/auto/core/qwebengineglobalsettings/tst_qwebengineglobalsettings.cpp b/tests/auto/core/qwebengineglobalsettings/tst_qwebengineglobalsettings.cpp index 3e46a823e..fe7a02ab4 100644 --- a/tests/auto/core/qwebengineglobalsettings/tst_qwebengineglobalsettings.cpp +++ b/tests/auto/core/qwebengineglobalsettings/tst_qwebengineglobalsettings.cpp @@ -32,7 +32,7 @@ private Q_SLOTS: void dnsOverHttps(); }; -Q_LOGGING_CATEGORY(lc, "qt.webengine.tests") +Q_STATIC_LOGGING_CATEGORY(lc, "qt.webengine.tests") void tst_QWebEngineGlobalSettings::dnsOverHttps_data() { diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp index c84de3599..86e82552c 100644 --- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp +++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp @@ -99,7 +99,7 @@ struct RequestInfo { static const QUrl kRedirectUrl = QUrl("qrc:///resources/content.html"); -Q_LOGGING_CATEGORY(lc, "qt.webengine.tests") +Q_STATIC_LOGGING_CATEGORY(lc, "qt.webengine.tests") class TestRequestInterceptor : public QWebEngineUrlRequestInterceptor { diff --git a/tests/auto/httpserver/httpserver.cpp b/tests/auto/httpserver/httpserver.cpp index 8a1d8e6f6..6bfca1c04 100644 --- a/tests/auto/httpserver/httpserver.cpp +++ b/tests/auto/httpserver/httpserver.cpp @@ -6,7 +6,7 @@ #include <QLoggingCategory> #include <QMimeDatabase> -Q_LOGGING_CATEGORY(gHttpServerLog, "HttpServer") +Q_STATIC_LOGGING_CATEGORY(gHttpServerLog, "HttpServer") HttpServer::HttpServer(QObject *parent) : HttpServer(new QTcpServer, "http", QHostAddress::LocalHost, 0, parent) diff --git a/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp b/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp index f5e946d19..3f1894916 100644 --- a/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp +++ b/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp @@ -7,7 +7,7 @@ #include <QPdfDocument> #include <QPdfSearchModel> -Q_LOGGING_CATEGORY(lcTests, "qt.pdf.tests") +Q_STATIC_LOGGING_CATEGORY(lcTests, "qt.pdf.tests") class tst_QPdfSearchModel: public QObject { diff --git a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp index 71c09077c..7694b5ead 100644 --- a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp +++ b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp @@ -15,7 +15,7 @@ using namespace Qt::StringLiterals; -Q_LOGGING_CATEGORY(lcTests, "qt.pdf.tests") +Q_STATIC_LOGGING_CATEGORY(lcTests, "qt.pdf.tests") class tst_MultiPageView : public QQuickDataTest { diff --git a/tests/auto/pdfquick/pdfpageimage/tst_pdfpageimage.cpp b/tests/auto/pdfquick/pdfpageimage/tst_pdfpageimage.cpp index 3f98025fa..f9eb6b94e 100644 --- a/tests/auto/pdfquick/pdfpageimage/tst_pdfpageimage.cpp +++ b/tests/auto/pdfquick/pdfpageimage/tst_pdfpageimage.cpp @@ -11,7 +11,7 @@ using namespace Qt::StringLiterals; -Q_LOGGING_CATEGORY(lcTests, "qt.pdf.tests") +Q_STATIC_LOGGING_CATEGORY(lcTests, "qt.pdf.tests") // #define DEBUG_WRITE_OUTPUT |