Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 70a7182

Browse files
wangwenx190wangwenx190
committed
use better solution to disable logging
Thank very much to @SineStriker ! Fixes: #181 Signed-off-by: Yuhang Zhao <2546789017@qq.com>
1 parent b8a3ff6 commit 70a7182

32 files changed

+384
-158
lines changed

‎src/core/chromepalette.cpp‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,18 @@
3030
FRAMELESSHELPER_BEGIN_NAMESPACE
3131

3232
Q_LOGGING_CATEGORY(lcChromePalette, "wangwenx190.framelesshelper.core.chromepalette")
33-
#define INFO qCInfo(lcChromePalette)
34-
#define DEBUG qCDebug(lcChromePalette)
35-
#define WARNING qCWarning(lcChromePalette)
36-
#define CRITICAL qCCritical(lcChromePalette)
33+
34+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
35+
# define INFO QT_NO_QDEBUG_MACRO()
36+
# define DEBUG QT_NO_QDEBUG_MACRO()
37+
# define WARNING QT_NO_QDEBUG_MACRO()
38+
# define CRITICAL QT_NO_QDEBUG_MACRO()
39+
#else
40+
# define INFO qCInfo(lcChromePalette)
41+
# define DEBUG qCDebug(lcChromePalette)
42+
# define WARNING qCWarning(lcChromePalette)
43+
# define CRITICAL qCCritical(lcChromePalette)
44+
#endif
3745

3846
using namespace Global;
3947

‎src/core/framelessconfig.cpp‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,18 @@
3131
FRAMELESSHELPER_BEGIN_NAMESPACE
3232

3333
Q_LOGGING_CATEGORY(lcFramelessConfig, "wangwenx190.framelesshelper.core.framelessconfig")
34-
#define INFO qCInfo(lcFramelessConfig)
35-
#define DEBUG qCDebug(lcFramelessConfig)
36-
#define WARNING qCWarning(lcFramelessConfig)
37-
#define CRITICAL qCCritical(lcFramelessConfig)
34+
35+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
36+
# define INFO QT_NO_QDEBUG_MACRO()
37+
# define DEBUG QT_NO_QDEBUG_MACRO()
38+
# define WARNING QT_NO_QDEBUG_MACRO()
39+
# define CRITICAL QT_NO_QDEBUG_MACRO()
40+
#else
41+
# define INFO qCInfo(lcFramelessConfig)
42+
# define DEBUG qCDebug(lcFramelessConfig)
43+
# define WARNING qCWarning(lcFramelessConfig)
44+
# define CRITICAL qCCritical(lcFramelessConfig)
45+
#endif
3846

3947
using namespace Global;
4048

‎src/core/framelesshelper_qt.cpp‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,18 @@
3434
FRAMELESSHELPER_BEGIN_NAMESPACE
3535

3636
Q_LOGGING_CATEGORY(lcFramelessHelperQt, "wangwenx190.framelesshelper.core.impl.qt")
37-
#define INFO qCInfo(lcFramelessHelperQt)
38-
#define DEBUG qCDebug(lcFramelessHelperQt)
39-
#define WARNING qCWarning(lcFramelessHelperQt)
40-
#define CRITICAL qCCritical(lcFramelessHelperQt)
37+
38+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
39+
# define INFO QT_NO_QDEBUG_MACRO()
40+
# define DEBUG QT_NO_QDEBUG_MACRO()
41+
# define WARNING QT_NO_QDEBUG_MACRO()
42+
# define CRITICAL QT_NO_QDEBUG_MACRO()
43+
#else
44+
# define INFO qCInfo(lcFramelessHelperQt)
45+
# define DEBUG qCDebug(lcFramelessHelperQt)
46+
# define WARNING qCWarning(lcFramelessHelperQt)
47+
# define CRITICAL qCCritical(lcFramelessHelperQt)
48+
#endif
4149

4250
using namespace Global;
4351

‎src/core/framelesshelper_win.cpp‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,18 @@
3838
FRAMELESSHELPER_BEGIN_NAMESPACE
3939

4040
Q_LOGGING_CATEGORY(lcFramelessHelperWin, "wangwenx190.framelesshelper.core.impl.win")
41-
#define INFO qCInfo(lcFramelessHelperWin)
42-
#define DEBUG qCDebug(lcFramelessHelperWin)
43-
#define WARNING qCWarning(lcFramelessHelperWin)
44-
#define CRITICAL qCCritical(lcFramelessHelperWin)
41+
42+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
43+
# define INFO QT_NO_QDEBUG_MACRO()
44+
# define DEBUG QT_NO_QDEBUG_MACRO()
45+
# define WARNING QT_NO_QDEBUG_MACRO()
46+
# define CRITICAL QT_NO_QDEBUG_MACRO()
47+
#else
48+
# define INFO qCInfo(lcFramelessHelperWin)
49+
# define DEBUG qCDebug(lcFramelessHelperWin)
50+
# define WARNING qCWarning(lcFramelessHelperWin)
51+
# define CRITICAL qCCritical(lcFramelessHelperWin)
52+
#endif
4553

4654
using namespace Global;
4755

‎src/core/framelesshelpercore_global.cpp‎

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,18 @@
7575
FRAMELESSHELPER_BEGIN_NAMESPACE
7676

7777
Q_LOGGING_CATEGORY(lcCoreGlobal, "wangwenx190.framelesshelper.core.global")
78-
#define INFO qCInfo(lcCoreGlobal)
79-
#define DEBUG qCDebug(lcCoreGlobal)
80-
#define WARNING qCWarning(lcCoreGlobal)
81-
#define CRITICAL qCCritical(lcCoreGlobal)
78+
79+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
80+
# define INFO QT_NO_QDEBUG_MACRO()
81+
# define DEBUG QT_NO_QDEBUG_MACRO()
82+
# define WARNING QT_NO_QDEBUG_MACRO()
83+
# define CRITICAL QT_NO_QDEBUG_MACRO()
84+
#else
85+
# define INFO qCInfo(lcCoreGlobal)
86+
# define DEBUG qCDebug(lcCoreGlobal)
87+
# define WARNING qCWarning(lcCoreGlobal)
88+
# define CRITICAL qCCritical(lcCoreGlobal)
89+
#endif
8290

8391
using namespace Global;
8492

@@ -96,40 +104,16 @@ FRAMELESSHELPER_BYTEARRAY_CONSTANT(xcb)
96104
#endif
97105

98106
[[maybe_unused]] static constexpr const char kNoLogoEnvVar[] = "FRAMELESSHELPER_NO_LOGO";
99-
FRAMELESSHELPER_STRING_CONSTANT2(FramelessHelperLogPrefix, "wangwenx190.framelesshelper.")
100107

101108
struct CoreData
102109
{
103110
QMutex mutex;
104111
QList<InitializeHookCallback> initHooks = {};
105112
QList<UninitializeHookCallback> uninitHooks = {};
106-
QLoggingCategory::CategoryFilter oldCategoryFilter = nullptr;
107113
};
108114

109115
Q_GLOBAL_STATIC(CoreData, coreData)
110116

111-
[[maybe_unused]] static inline void flhCategoryFilter(QLoggingCategory *category)
112-
{
113-
Q_ASSERT(category);
114-
if (!category) {
115-
return;
116-
}
117-
coreData()->mutex.lock();
118-
if (coreData()->oldCategoryFilter) {
119-
coreData()->oldCategoryFilter(category);
120-
}
121-
coreData()->mutex.unlock();
122-
const QString categoryName = QUtf8String(category->categoryName());
123-
if (!categoryName.isEmpty()
124-
&& categoryName.startsWith(kFramelessHelperLogPrefix, Qt::CaseInsensitive)) {
125-
category->setEnabled(QtInfoMsg, false);
126-
category->setEnabled(QtDebugMsg, false);
127-
category->setEnabled(QtWarningMsg, false);
128-
category->setEnabled(QtCriticalMsg, false);
129-
// QtFatalMsg cannot be changed; it will always remain true.
130-
}
131-
}
132-
133117
namespace FramelessHelper::Core
134118
{
135119

@@ -141,12 +125,6 @@ void initialize()
141125
}
142126
inited = true;
143127

144-
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
145-
coreData()->mutex.lock();
146-
coreData()->oldCategoryFilter = QLoggingCategory::installFilter(flhCategoryFilter);
147-
coreData()->mutex.unlock();
148-
#endif
149-
150128
outputLogo();
151129

152130
#ifdef Q_OS_LINUX

‎src/core/framelessmanager.cpp‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,18 @@ static inline void initResource()
5252
FRAMELESSHELPER_BEGIN_NAMESPACE
5353

5454
Q_LOGGING_CATEGORY(lcFramelessManager, "wangwenx190.framelesshelper.core.framelessmanager")
55-
#define INFO qCInfo(lcFramelessManager)
56-
#define DEBUG qCDebug(lcFramelessManager)
57-
#define WARNING qCWarning(lcFramelessManager)
58-
#define CRITICAL qCCritical(lcFramelessManager)
55+
56+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
57+
# define INFO QT_NO_QDEBUG_MACRO()
58+
# define DEBUG QT_NO_QDEBUG_MACRO()
59+
# define WARNING QT_NO_QDEBUG_MACRO()
60+
# define CRITICAL QT_NO_QDEBUG_MACRO()
61+
#else
62+
# define INFO qCInfo(lcFramelessManager)
63+
# define DEBUG qCDebug(lcFramelessManager)
64+
# define WARNING qCWarning(lcFramelessManager)
65+
# define CRITICAL qCCritical(lcFramelessManager)
66+
#endif
5967

6068
using namespace Global;
6169

‎src/core/micamaterial.cpp‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,18 @@ static inline void initResource()
4949
FRAMELESSHELPER_BEGIN_NAMESPACE
5050

5151
Q_LOGGING_CATEGORY(lcMicaMaterial, "wangwenx190.framelesshelper.core.micamaterial")
52-
#define INFO qCInfo(lcMicaMaterial)
53-
#define DEBUG qCDebug(lcMicaMaterial)
54-
#define WARNING qCWarning(lcMicaMaterial)
55-
#define CRITICAL qCCritical(lcMicaMaterial)
52+
53+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
54+
# define INFO QT_NO_QDEBUG_MACRO()
55+
# define DEBUG QT_NO_QDEBUG_MACRO()
56+
# define WARNING QT_NO_QDEBUG_MACRO()
57+
# define CRITICAL QT_NO_QDEBUG_MACRO()
58+
#else
59+
# define INFO qCInfo(lcMicaMaterial)
60+
# define DEBUG qCDebug(lcMicaMaterial)
61+
# define WARNING qCWarning(lcMicaMaterial)
62+
# define CRITICAL qCCritical(lcMicaMaterial)
63+
#endif
5664

5765
using namespace Global;
5866

‎src/core/registrykey.cpp‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,18 @@
3333
FRAMELESSHELPER_BEGIN_NAMESPACE
3434

3535
Q_LOGGING_CATEGORY(lcCoreRegistryKey, "wangwenx190.framelesshelper.core.registrykey")
36-
#define INFO qCInfo(lcCoreRegistryKey)
37-
#define DEBUG qCDebug(lcCoreRegistryKey)
38-
#define WARNING qCWarning(lcCoreRegistryKey)
39-
#define CRITICAL qCCritical(lcCoreRegistryKey)
36+
37+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
38+
# define INFO QT_NO_QDEBUG_MACRO()
39+
# define DEBUG QT_NO_QDEBUG_MACRO()
40+
# define WARNING QT_NO_QDEBUG_MACRO()
41+
# define CRITICAL QT_NO_QDEBUG_MACRO()
42+
#else
43+
# define INFO qCInfo(lcCoreRegistryKey)
44+
# define DEBUG qCDebug(lcCoreRegistryKey)
45+
# define WARNING qCWarning(lcCoreRegistryKey)
46+
# define CRITICAL qCCritical(lcCoreRegistryKey)
47+
#endif
4048

4149
using namespace Global;
4250

‎src/core/sysapiloader.cpp‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,18 @@
3434
FRAMELESSHELPER_BEGIN_NAMESPACE
3535

3636
Q_LOGGING_CATEGORY(lcSysApiLoader, "wangwenx190.framelesshelper.core.sysapiloader")
37-
#define INFO qCInfo(lcSysApiLoader)
38-
#define DEBUG qCDebug(lcSysApiLoader)
39-
#define WARNING qCWarning(lcSysApiLoader)
40-
#define CRITICAL qCCritical(lcSysApiLoader)
37+
38+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
39+
# define INFO QT_NO_QDEBUG_MACRO()
40+
# define DEBUG QT_NO_QDEBUG_MACRO()
41+
# define WARNING QT_NO_QDEBUG_MACRO()
42+
# define CRITICAL QT_NO_QDEBUG_MACRO()
43+
#else
44+
# define INFO qCInfo(lcSysApiLoader)
45+
# define DEBUG qCDebug(lcSysApiLoader)
46+
# define WARNING qCWarning(lcSysApiLoader)
47+
# define CRITICAL qCCritical(lcSysApiLoader)
48+
#endif
4149

4250
struct SysApiLoaderData
4351
{

‎src/core/utils.cpp‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,18 @@
3939
FRAMELESSHELPER_BEGIN_NAMESPACE
4040

4141
Q_LOGGING_CATEGORY(lcUtilsCommon, "wangwenx190.framelesshelper.core.utils.common")
42-
#define INFO qCInfo(lcUtilsCommon)
43-
#define DEBUG qCDebug(lcUtilsCommon)
44-
#define WARNING qCWarning(lcUtilsCommon)
45-
#define CRITICAL qCCritical(lcUtilsCommon)
42+
43+
#ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT
44+
# define INFO QT_NO_QDEBUG_MACRO()
45+
# define DEBUG QT_NO_QDEBUG_MACRO()
46+
# define WARNING QT_NO_QDEBUG_MACRO()
47+
# define CRITICAL QT_NO_QDEBUG_MACRO()
48+
#else
49+
# define INFO qCInfo(lcUtilsCommon)
50+
# define DEBUG qCDebug(lcUtilsCommon)
51+
# define WARNING qCWarning(lcUtilsCommon)
52+
# define CRITICAL qCCritical(lcUtilsCommon)
53+
#endif
4654

4755
using namespace Global;
4856

0 commit comments

Comments
 (0)