diff --git a/include/FramelessHelper/Core/chromepalette.h b/include/FramelessHelper/Core/chromepalette.h index 46a2cae..e08c200 100644 --- a/include/FramelessHelper/Core/chromepalette.h +++ b/include/FramelessHelper/Core/chromepalette.h @@ -28,8 +28,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcChromePalette) - class ChromePalettePrivate; class FRAMELESSHELPER_CORE_API ChromePalette : public QObject diff --git a/include/FramelessHelper/Core/framelesshelper_qt.h b/include/FramelessHelper/Core/framelesshelper_qt.h index 0d92733..4d3410d 100644 --- a/include/FramelessHelper/Core/framelesshelper_qt.h +++ b/include/FramelessHelper/Core/framelesshelper_qt.h @@ -28,8 +28,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFramelessHelperQt) - class FRAMELESSHELPER_CORE_API FramelessHelperQt : public QObject { Q_OBJECT diff --git a/include/FramelessHelper/Core/framelesshelper_win.h b/include/FramelessHelper/Core/framelesshelper_win.h index 37611d1..5335e50 100644 --- a/include/FramelessHelper/Core/framelesshelper_win.h +++ b/include/FramelessHelper/Core/framelesshelper_win.h @@ -29,8 +29,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFramelessHelperWin) - class FRAMELESSHELPER_CORE_API FramelessHelperWin : public QAbstractNativeEventFilter { Q_DISABLE_COPY_MOVE(FramelessHelperWin) diff --git a/include/FramelessHelper/Core/framelesshelpercore_global.h b/include/FramelessHelper/Core/framelesshelpercore_global.h index 71ad5d6..b757a9e 100644 --- a/include/FramelessHelper/Core/framelesshelpercore_global.h +++ b/include/FramelessHelper/Core/framelesshelpercore_global.h @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -193,9 +192,7 @@ QT_END_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcCoreGlobal) - -#include +#include "framelesshelper.version" [[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION = FRAMELESSHELPER_MAKE_VERSION(FRAMELESSHELPER_VERSION_MAJOR, FRAMELESSHELPER_VERSION_MINOR, diff --git a/include/FramelessHelper/Core/framelessmanager.h b/include/FramelessHelper/Core/framelessmanager.h index 098cd74..0a5bfe8 100644 --- a/include/FramelessHelper/Core/framelessmanager.h +++ b/include/FramelessHelper/Core/framelessmanager.h @@ -28,8 +28,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFramelessManager) - class FramelessManagerPrivate; class FRAMELESSHELPER_CORE_API FramelessManager : public QObject diff --git a/include/FramelessHelper/Core/micamaterial.h b/include/FramelessHelper/Core/micamaterial.h index 030763c..6a3117a 100644 --- a/include/FramelessHelper/Core/micamaterial.h +++ b/include/FramelessHelper/Core/micamaterial.h @@ -28,8 +28,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcMicaMaterial) - class MicaMaterialPrivate; class FRAMELESSHELPER_CORE_API MicaMaterial : public QObject diff --git a/include/FramelessHelper/Core/utils.h b/include/FramelessHelper/Core/utils.h index 33bdf2d..db9a16c 100644 --- a/include/FramelessHelper/Core/utils.h +++ b/include/FramelessHelper/Core/utils.h @@ -31,15 +31,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcUtilsCommon) -#ifdef Q_OS_WINDOWS - Q_DECLARE_LOGGING_CATEGORY(lcUtilsWin) -#elif defined(Q_OS_LINUX) - Q_DECLARE_LOGGING_CATEGORY(lcUtilsLinux) -#elif defined(Q_OS_MACOS) - Q_DECLARE_LOGGING_CATEGORY(lcUtilsMac) -#endif - namespace Utils { diff --git a/include/FramelessHelper/Core/windowborderpainter.h b/include/FramelessHelper/Core/windowborderpainter.h index b9bb52c..2b625b9 100644 --- a/include/FramelessHelper/Core/windowborderpainter.h +++ b/include/FramelessHelper/Core/windowborderpainter.h @@ -28,8 +28,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcWindowBorderPainter) - class WindowBorderPainterPrivate; class FRAMELESSHELPER_CORE_API WindowBorderPainter : public QObject diff --git a/include/FramelessHelper/Quick/framelesshelperquick_global.h b/include/FramelessHelper/Quick/framelesshelperquick_global.h index d9f39a5..38bbc72 100644 --- a/include/FramelessHelper/Quick/framelesshelperquick_global.h +++ b/include/FramelessHelper/Quick/framelesshelperquick_global.h @@ -73,8 +73,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcQuickGlobal) - [[maybe_unused]] inline constexpr const char FRAMELESSHELPER_QUICK_URI[] = "org.wangwenx190.FramelessHelper"; class FRAMELESSHELPER_QUICK_API QuickGlobal : public QObject diff --git a/include/FramelessHelper/Quick/framelessquickhelper.h b/include/FramelessHelper/Quick/framelessquickhelper.h index ce775da..ac79bff 100644 --- a/include/FramelessHelper/Quick/framelessquickhelper.h +++ b/include/FramelessHelper/Quick/framelessquickhelper.h @@ -30,8 +30,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFramelessQuickHelper) - class FramelessQuickHelperPrivate; class QuickMicaMaterial; class QuickWindowBorder; diff --git a/include/FramelessHelper/Quick/framelessquickmodule.h b/include/FramelessHelper/Quick/framelessquickmodule.h index 7d3523e..3465cf1 100644 --- a/include/FramelessHelper/Quick/framelessquickmodule.h +++ b/include/FramelessHelper/Quick/framelessquickmodule.h @@ -32,8 +32,6 @@ QT_END_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcQuickModule) - namespace FramelessHelper::Quick { FRAMELESSHELPER_QUICK_API void registerTypes(QQmlEngine *engine); diff --git a/include/FramelessHelper/Quick/framelessquickutils.h b/include/FramelessHelper/Quick/framelessquickutils.h index 34811ba..480122b 100644 --- a/include/FramelessHelper/Quick/framelessquickutils.h +++ b/include/FramelessHelper/Quick/framelessquickutils.h @@ -33,8 +33,6 @@ QT_END_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFramelessQuickUtils) - class FRAMELESSHELPER_QUICK_API FramelessQuickUtils : public QObject, public QQmlParserStatus { Q_OBJECT diff --git a/include/FramelessHelper/Quick/quickchromepalette.h b/include/FramelessHelper/Quick/quickchromepalette.h index 38c74bb..4bee9c8 100644 --- a/include/FramelessHelper/Quick/quickchromepalette.h +++ b/include/FramelessHelper/Quick/quickchromepalette.h @@ -30,8 +30,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcQuickChromePalette) - class FRAMELESSHELPER_QUICK_API QuickChromePalette : public ChromePalette, public QQmlParserStatus { Q_OBJECT diff --git a/include/FramelessHelper/Quick/quickimageitem.h b/include/FramelessHelper/Quick/quickimageitem.h index 3dafbd1..9605ba6 100644 --- a/include/FramelessHelper/Quick/quickimageitem.h +++ b/include/FramelessHelper/Quick/quickimageitem.h @@ -29,8 +29,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcQuickImageItem) - class QuickImageItemPrivate; class FRAMELESSHELPER_QUICK_API QuickImageItem : public QQuickPaintedItem diff --git a/include/FramelessHelper/Quick/quickmicamaterial.h b/include/FramelessHelper/Quick/quickmicamaterial.h index 106bfea..10eae6d 100644 --- a/include/FramelessHelper/Quick/quickmicamaterial.h +++ b/include/FramelessHelper/Quick/quickmicamaterial.h @@ -29,8 +29,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcQuickMicaMaterial) - class QuickMicaMaterialPrivate; class FRAMELESSHELPER_QUICK_API QuickMicaMaterial : public QQuickItem diff --git a/include/FramelessHelper/Quick/quickwindowborder.h b/include/FramelessHelper/Quick/quickwindowborder.h index db4335f..28d3d50 100644 --- a/include/FramelessHelper/Quick/quickwindowborder.h +++ b/include/FramelessHelper/Quick/quickwindowborder.h @@ -29,8 +29,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcQuickWindowBorder) - class QuickWindowBorderPrivate; class FRAMELESSHELPER_QUICK_API QuickWindowBorder : public QQuickPaintedItem diff --git a/include/FramelessHelper/Widgets/framelessdialog.h b/include/FramelessHelper/Widgets/framelessdialog.h index 04a18c3..c731697 100644 --- a/include/FramelessHelper/Widgets/framelessdialog.h +++ b/include/FramelessHelper/Widgets/framelessdialog.h @@ -29,8 +29,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFramelessDialog) - class FramelessDialogPrivate; class FRAMELESSHELPER_WIDGETS_API FramelessDialog : public QDialog diff --git a/include/FramelessHelper/Widgets/framelesshelperwidgets_global.h b/include/FramelessHelper/Widgets/framelesshelperwidgets_global.h index 2b0dddb..8ba3a18 100644 --- a/include/FramelessHelper/Widgets/framelesshelperwidgets_global.h +++ b/include/FramelessHelper/Widgets/framelesshelperwidgets_global.h @@ -40,8 +40,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcWidgetsGlobal) - namespace FramelessHelper::Widgets { FRAMELESSHELPER_WIDGETS_API void initialize(); diff --git a/include/FramelessHelper/Widgets/framelessmainwindow.h b/include/FramelessHelper/Widgets/framelessmainwindow.h index b27a3b9..ec87b4f 100644 --- a/include/FramelessHelper/Widgets/framelessmainwindow.h +++ b/include/FramelessHelper/Widgets/framelessmainwindow.h @@ -29,8 +29,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFramelessMainWindow) - class FramelessMainWindowPrivate; class FRAMELESSHELPER_WIDGETS_API FramelessMainWindow : public QMainWindow diff --git a/include/FramelessHelper/Widgets/framelesswidget.h b/include/FramelessHelper/Widgets/framelesswidget.h index c299e3d..08fc1b1 100644 --- a/include/FramelessHelper/Widgets/framelesswidget.h +++ b/include/FramelessHelper/Widgets/framelesswidget.h @@ -29,8 +29,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFramelessWidget) - class FramelessWidgetPrivate; class FRAMELESSHELPER_WIDGETS_API FramelessWidget : public QWidget diff --git a/include/FramelessHelper/Widgets/framelesswidgetshelper.h b/include/FramelessHelper/Widgets/framelesswidgetshelper.h index d5b1ddc..4493fa4 100644 --- a/include/FramelessHelper/Widgets/framelesswidgetshelper.h +++ b/include/FramelessHelper/Widgets/framelesswidgetshelper.h @@ -29,8 +29,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFramelessWidgetsHelper) - class FramelessWidgetsHelperPrivate; class MicaMaterial; class WindowBorderPainter; diff --git a/include/FramelessHelper/Widgets/standardsystembutton.h b/include/FramelessHelper/Widgets/standardsystembutton.h index 8347885..1cf04cf 100644 --- a/include/FramelessHelper/Widgets/standardsystembutton.h +++ b/include/FramelessHelper/Widgets/standardsystembutton.h @@ -29,8 +29,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcStandardSystemButton) - class StandardSystemButtonPrivate; class FRAMELESSHELPER_WIDGETS_API StandardSystemButton : public QAbstractButton diff --git a/include/FramelessHelper/Widgets/standardtitlebar.h b/include/FramelessHelper/Widgets/standardtitlebar.h index e60287b..3b777b3 100644 --- a/include/FramelessHelper/Widgets/standardtitlebar.h +++ b/include/FramelessHelper/Widgets/standardtitlebar.h @@ -31,8 +31,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcStandardTitleBar) - class StandardTitleBarPrivate; class FRAMELESSHELPER_WIDGETS_API StandardTitleBar : public QWidget diff --git a/src/core/chromepalette.cpp b/src/core/chromepalette.cpp index dffbe4d..a7cc219 100644 --- a/src/core/chromepalette.cpp +++ b/src/core/chromepalette.cpp @@ -26,10 +26,11 @@ #include "chromepalette_p.h" #include "framelessmanager.h" #include "utils.h" +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcChromePalette, "wangwenx190.framelesshelper.core.chromepalette") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcChromePalette, "wangwenx190.framelesshelper.core.chromepalette") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/framelessconfig.cpp b/src/core/framelessconfig.cpp index dc57276..6103b74 100644 --- a/src/core/framelessconfig.cpp +++ b/src/core/framelessconfig.cpp @@ -28,10 +28,11 @@ #include #include #include +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessConfig, "wangwenx190.framelesshelper.core.framelessconfig") +static Q_LOGGING_CATEGORY(lcFramelessConfig, "wangwenx190.framelesshelper.core.framelessconfig") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/framelesshelper_qt.cpp b/src/core/framelesshelper_qt.cpp index babadd5..01cf473 100644 --- a/src/core/framelesshelper_qt.cpp +++ b/src/core/framelesshelper_qt.cpp @@ -23,17 +23,18 @@ */ #include "framelesshelper_qt.h" -#include -#include -#include #include "framelessmanager.h" #include "framelessmanager_p.h" #include "framelessconfig_p.h" #include "utils.h" +#include +#include +#include +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessHelperQt, "wangwenx190.framelesshelper.core.impl.qt") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcFramelessHelperQt, "wangwenx190.framelesshelper.core.impl.qt") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/framelesshelper_win.cpp b/src/core/framelesshelper_win.cpp index 5539f78..aaba3a9 100644 --- a/src/core/framelesshelper_win.cpp +++ b/src/core/framelesshelper_win.cpp @@ -23,22 +23,23 @@ */ #include "framelesshelper_win.h" -#include -#include -#include -#include -#include -#include #include "framelessmanager.h" #include "framelessmanager_p.h" #include "framelessconfig_p.h" #include "utils.h" #include "winverhelper_p.h" #include "framelesshelper_windows.h" +#include +#include +#include +#include +#include +#include +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessHelperWin, "wangwenx190.framelesshelper.core.impl.win") +static Q_LOGGING_CATEGORY(lcFramelessHelperWin, "wangwenx190.framelesshelper.core.impl.win") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/framelesshelpercore_global.cpp b/src/core/framelesshelpercore_global.cpp index e3b5ab4..7a1b3c4 100644 --- a/src/core/framelesshelpercore_global.cpp +++ b/src/core/framelesshelpercore_global.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #ifndef COMPILER_STRING # ifdef Q_CC_CLANG // Must be before GNU, because Clang claims to be GNU too. @@ -114,7 +115,7 @@ QT_END_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcCoreGlobal, "wangwenx190.framelesshelper.core.global") +static Q_LOGGING_CATEGORY(lcCoreGlobal, "wangwenx190.framelesshelper.core.global") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/framelessmanager.cpp b/src/core/framelessmanager.cpp index 0e50722..cd68f7e 100644 --- a/src/core/framelessmanager.cpp +++ b/src/core/framelessmanager.cpp @@ -24,14 +24,6 @@ #include "framelessmanager.h" #include "framelessmanager_p.h" -#include -#include -#include -#include -#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) -# include -# include -#endif // (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) #include "framelesshelper_qt.h" #include "framelessconfig_p.h" #include "utils.h" @@ -39,6 +31,15 @@ # include "framelesshelper_win.h" # include "winverhelper_p.h" #endif +#include +#include +#include +#include +#include +#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) +# include +# include +#endif // (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) #ifndef FRAMELESSHELPER_CORE_NO_BUNDLE_RESOURCE // The "Q_INIT_RESOURCE()" macro can't be used within a namespace, @@ -53,7 +54,7 @@ static inline void initResource() FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessManager, "wangwenx190.framelesshelper.core.framelessmanager") +static Q_LOGGING_CATEGORY(lcFramelessManager, "wangwenx190.framelesshelper.core.framelessmanager") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/micamaterial.cpp b/src/core/micamaterial.cpp index f4d9258..4e334fb 100644 --- a/src/core/micamaterial.cpp +++ b/src/core/micamaterial.cpp @@ -29,6 +29,7 @@ #include "framelessconfig_p.h" #include #include +#include #include #include #include @@ -51,7 +52,7 @@ static inline void initResource() FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcMicaMaterial, "wangwenx190.framelesshelper.core.micamaterial") +static Q_LOGGING_CATEGORY(lcMicaMaterial, "wangwenx190.framelesshelper.core.micamaterial") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/registrykey.cpp b/src/core/registrykey.cpp index 21cb472..5045354 100644 --- a/src/core/registrykey.cpp +++ b/src/core/registrykey.cpp @@ -24,6 +24,7 @@ #include "registrykey_p.h" #include "framelesshelper_windows.h" +#include #if REGISTRYKEY_QWINREGISTRYKEY # include #else @@ -32,7 +33,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcCoreRegistryKey, "wangwenx190.framelesshelper.core.registrykey") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcCoreRegistryKey, "wangwenx190.framelesshelper.core.registrykey") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/sysapiloader.cpp b/src/core/sysapiloader.cpp index 408acae..adf82a1 100644 --- a/src/core/sysapiloader.cpp +++ b/src/core/sysapiloader.cpp @@ -46,6 +46,7 @@ #include #include +#include #if SYSAPILOADER_QSYSTEMLIBRARY # include #endif // SYSAPILOADER_QSYSTEMLIBRARY @@ -55,7 +56,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcSysApiLoader, "wangwenx190.framelesshelper.core.sysapiloader") +static Q_LOGGING_CATEGORY(lcSysApiLoader, "wangwenx190.framelesshelper.core.sysapiloader") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/utils.cpp b/src/core/utils.cpp index ea81ea7..61bd15f 100644 --- a/src/core/utils.cpp +++ b/src/core/utils.cpp @@ -26,6 +26,7 @@ #ifdef Q_OS_WINDOWS # include "winverhelper_p.h" #endif // Q_OS_WINDOWS +#include #include #include #include @@ -42,7 +43,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcUtilsCommon, "wangwenx190.framelesshelper.core.utils.common") +static Q_LOGGING_CATEGORY(lcUtilsCommon, "wangwenx190.framelesshelper.core.utils.common") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/utils_linux.cpp b/src/core/utils_linux.cpp index 8c851c2..991404b 100644 --- a/src/core/utils_linux.cpp +++ b/src/core/utils_linux.cpp @@ -27,6 +27,7 @@ #include "framelessmanager.h" #include "framelessmanager_p.h" #include // for std::memcpy +#include #include #include #include @@ -53,7 +54,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcUtilsLinux, "wangwenx190.framelesshelper.core.utils.linux") +static Q_LOGGING_CATEGORY(lcUtilsLinux, "wangwenx190.framelesshelper.core.utils.linux") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/utils_mac.mm b/src/core/utils_mac.mm index 20cf694..87e9c83 100644 --- a/src/core/utils_mac.mm +++ b/src/core/utils_mac.mm @@ -29,6 +29,7 @@ #include #include #include +#include #if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) # include #else @@ -64,7 +65,7 @@ FRAMELESSHELPER_END_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcUtilsMac, "wangwenx190.framelesshelper.core.utils.mac") +static Q_LOGGING_CATEGORY(lcUtilsMac, "wangwenx190.framelesshelper.core.utils.mac") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/utils_win.cpp b/src/core/utils_win.cpp index 3327e9a..2f4e203 100644 --- a/src/core/utils_win.cpp +++ b/src/core/utils_win.cpp @@ -31,6 +31,7 @@ #include "winverhelper_p.h" #include #include +#include #include #include #ifndef FRAMELESSHELPER_CORE_NO_PRIVATE @@ -51,7 +52,7 @@ Q_DECLARE_METATYPE(QMargins) FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcUtilsWin, "wangwenx190.framelesshelper.core.utils.win") +static Q_LOGGING_CATEGORY(lcUtilsWin, "wangwenx190.framelesshelper.core.utils.win") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/core/windowborderpainter.cpp b/src/core/windowborderpainter.cpp index 16e9a1d..b123d41 100644 --- a/src/core/windowborderpainter.cpp +++ b/src/core/windowborderpainter.cpp @@ -29,11 +29,12 @@ #ifdef Q_OS_WINDOWS # include "winverhelper_p.h" #endif +#include #include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcWindowBorderPainter, "wangwenx190.framelesshelper.core.windowborderpainter") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcWindowBorderPainter, "wangwenx190.framelesshelper.core.windowborderpainter") #ifdef FRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/framelesshelperquick_global.cpp b/src/quick/framelesshelperquick_global.cpp index 0b050ad..ea11b8b 100644 --- a/src/quick/framelesshelperquick_global.cpp +++ b/src/quick/framelesshelperquick_global.cpp @@ -43,10 +43,11 @@ # include "framelessquickapplicationwindow_p_p.h" # endif // FRAMELESSHELPER_QUICK_NO_PRIVATE #endif // (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQuickGlobal, "wangwenx190.framelesshelper.quick.global") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcQuickGlobal, "wangwenx190.framelesshelper.quick.global") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/framelessquickapplicationwindow.cpp b/src/quick/framelessquickapplicationwindow.cpp index 6174c49..e44c7d3 100644 --- a/src/quick/framelessquickapplicationwindow.cpp +++ b/src/quick/framelessquickapplicationwindow.cpp @@ -28,14 +28,15 @@ #include "framelessquickapplicationwindow_p_p.h" #include "framelessquickhelper.h" #include "quickwindowborder.h" -#include #ifdef Q_OS_WINDOWS # include #endif // Q_OS_WINDOWS +#include +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessQuickApplicationWindow, "wangwenx190.framelesshelper.quick.framelessquickapplicationwindow") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcFramelessQuickApplicationWindow, "wangwenx190.framelesshelper.quick.framelessquickapplicationwindow") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/framelessquickhelper.cpp b/src/quick/framelessquickhelper.cpp index 40b0ce0..a5ecdb1 100644 --- a/src/quick/framelessquickhelper.cpp +++ b/src/quick/framelessquickhelper.cpp @@ -26,8 +26,15 @@ #include "framelessquickhelper_p.h" #include "quickmicamaterial.h" #include "quickwindowborder.h" +#include +#include +#include +#ifdef Q_OS_WINDOWS +# include +#endif // Q_OS_WINDOWS #include #include +#include #ifndef FRAMELESSHELPER_QUICK_NO_PRIVATE # if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) # include // For QWINDOWSIZE_MAX @@ -38,12 +45,6 @@ # include # include #endif // FRAMELESSHELPER_QUICK_NO_PRIVATE -#include -#include -#include -#ifdef Q_OS_WINDOWS -# include -#endif // Q_OS_WINDOWS #ifndef QWINDOWSIZE_MAX # define QWINDOWSIZE_MAX ((1 << 24) - 1) @@ -51,7 +52,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessQuickHelper, "wangwenx190.framelesshelper.quick.framelessquickhelper") +static Q_LOGGING_CATEGORY(lcFramelessQuickHelper, "wangwenx190.framelesshelper.quick.framelessquickhelper") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/framelessquickmodule.cpp b/src/quick/framelessquickmodule.cpp index 21a5f1e..3f72968 100644 --- a/src/quick/framelessquickmodule.cpp +++ b/src/quick/framelessquickmodule.cpp @@ -37,6 +37,7 @@ # include "quickstandardtitlebar_p.h" # endif // (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #endif // FRAMELESSHELPER_QUICK_NO_PRIVATE +#include #ifndef QUICK_URI_SHORT # define QUICK_URI_SHORT FRAMELESSHELPER_QUICK_URI, 1 @@ -52,7 +53,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQuickModule, "wangwenx190.framelesshelper.quick.quickmodule") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcQuickModule, "wangwenx190.framelesshelper.quick.quickmodule") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/framelessquickutils.cpp b/src/quick/framelessquickutils.cpp index c10e87d..f3bc371 100644 --- a/src/quick/framelessquickutils.cpp +++ b/src/quick/framelessquickutils.cpp @@ -28,10 +28,11 @@ #ifdef Q_OS_WINDOWS # include #endif // Q_OS_WINDOWS +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessQuickUtils, "wangwenx190.framelesshelper.quick.framelessquickutils") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcFramelessQuickUtils, "wangwenx190.framelesshelper.quick.framelessquickutils") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/framelessquickwindow.cpp b/src/quick/framelessquickwindow.cpp index da10997..f5ccee8 100644 --- a/src/quick/framelessquickwindow.cpp +++ b/src/quick/framelessquickwindow.cpp @@ -28,14 +28,15 @@ #include "framelessquickwindow_p_p.h" #include "framelessquickhelper.h" #include "quickwindowborder.h" -#include #ifdef Q_OS_WINDOWS # include #endif // Q_OS_WINDOWS +#include +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessQuickWindow, "wangwenx190.framelesshelper.quick.framelessquickwindow") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcFramelessQuickWindow, "wangwenx190.framelesshelper.quick.framelessquickwindow") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/quickchromepalette.cpp b/src/quick/quickchromepalette.cpp index 943c5dd..5088ef4 100644 --- a/src/quick/quickchromepalette.cpp +++ b/src/quick/quickchromepalette.cpp @@ -23,10 +23,11 @@ */ #include "quickchromepalette.h" +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQuickChromePalette, "wangwenx190.framelesshelper.quick.quickchromepalette") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcQuickChromePalette, "wangwenx190.framelesshelper.quick.quickchromepalette") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/quickimageitem.cpp b/src/quick/quickimageitem.cpp index 395a8e0..cfb9440 100644 --- a/src/quick/quickimageitem.cpp +++ b/src/quick/quickimageitem.cpp @@ -24,6 +24,7 @@ #include "quickimageitem.h" #include "quickimageitem_p.h" +#include #include #include #include @@ -31,7 +32,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQuickImageItem, "wangwenx190.framelesshelper.quick.quickimageitem") +static Q_LOGGING_CATEGORY(lcQuickImageItem, "wangwenx190.framelesshelper.quick.quickimageitem") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/quickmicamaterial.cpp b/src/quick/quickmicamaterial.cpp index 27755d5..b353d1d 100644 --- a/src/quick/quickmicamaterial.cpp +++ b/src/quick/quickmicamaterial.cpp @@ -26,6 +26,7 @@ #include "quickmicamaterial_p.h" #include #include +#include #include #include #include @@ -37,7 +38,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQuickMicaMaterial, "wangwenx190.framelesshelper.quick.quickmicamaterial") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcQuickMicaMaterial, "wangwenx190.framelesshelper.quick.quickmicamaterial") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/quickstandardsystembutton.cpp b/src/quick/quickstandardsystembutton.cpp index 8f277e5..790739f 100644 --- a/src/quick/quickstandardsystembutton.cpp +++ b/src/quick/quickstandardsystembutton.cpp @@ -28,6 +28,7 @@ #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #include #include +#include #include #include #include @@ -37,7 +38,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQuickStandardSystemButton, "wangwenx190.framelesshelper.quick.quickstandardsystembutton") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcQuickStandardSystemButton, "wangwenx190.framelesshelper.quick.quickstandardsystembutton") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/quickstandardtitlebar.cpp b/src/quick/quickstandardtitlebar.cpp index 1b6063c..1b5621e 100644 --- a/src/quick/quickstandardtitlebar.cpp +++ b/src/quick/quickstandardtitlebar.cpp @@ -31,6 +31,7 @@ #include "quickstandardsystembutton_p.h" #include "framelessquickwindow_p.h" #include +#include #include #include #include @@ -40,7 +41,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQuickStandardTitleBar, "wangwenx190.framelesshelper.quick.quickstandardtitlebar") +static Q_LOGGING_CATEGORY(lcQuickStandardTitleBar, "wangwenx190.framelesshelper.quick.quickstandardtitlebar") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/quick/quickwindowborder.cpp b/src/quick/quickwindowborder.cpp index 2f20b6c..7a5bad9 100644 --- a/src/quick/quickwindowborder.cpp +++ b/src/quick/quickwindowborder.cpp @@ -25,6 +25,7 @@ #include "quickwindowborder.h" #include "quickwindowborder_p.h" #include +#include #include #ifndef FRAMELESSHELPER_QUICK_NO_PRIVATE # include @@ -32,7 +33,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQuickWindowBorder, "wangwenx190.framelesshelper.quick.quickwindowborder") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcQuickWindowBorder, "wangwenx190.framelesshelper.quick.quickwindowborder") #ifdef FRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/widgets/framelessdialog.cpp b/src/widgets/framelessdialog.cpp index 4ee6226..49ba0c0 100644 --- a/src/widgets/framelessdialog.cpp +++ b/src/widgets/framelessdialog.cpp @@ -27,10 +27,11 @@ #include "framelesswidgetshelper.h" #include "widgetssharedhelper_p.h" #include +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessDialog, "wangwenx190.framelesshelper.widgets.framelessdialog") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcFramelessDialog, "wangwenx190.framelesshelper.widgets.framelessdialog") #ifdef FRAMELESSHELPER_WIDGETS_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/widgets/framelesshelperwidgets_global.cpp b/src/widgets/framelesshelperwidgets_global.cpp index 48f92e3..7ae85ce 100644 --- a/src/widgets/framelesshelperwidgets_global.cpp +++ b/src/widgets/framelesshelperwidgets_global.cpp @@ -36,10 +36,11 @@ #include "framelesswidget_p.h" #include "framelessmainwindow_p.h" #include "framelessdialog_p.h" +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcWidgetsGlobal, "wangwenx190.framelesshelper.widgets.global") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcWidgetsGlobal, "wangwenx190.framelesshelper.widgets.global") #ifdef FRAMELESSHELPER_WIDGETS_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/widgets/framelessmainwindow.cpp b/src/widgets/framelessmainwindow.cpp index 8df5055..41c309f 100644 --- a/src/widgets/framelessmainwindow.cpp +++ b/src/widgets/framelessmainwindow.cpp @@ -27,10 +27,11 @@ #include "framelesswidgetshelper.h" #include "widgetssharedhelper_p.h" #include +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessMainWindow, "wangwenx190.framelesshelper.widgets.framelessmainwindow") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcFramelessMainWindow, "wangwenx190.framelesshelper.widgets.framelessmainwindow") #ifdef FRAMELESSHELPER_WIDGETS_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/widgets/framelesswidget.cpp b/src/widgets/framelesswidget.cpp index c69ac2f..7ce4feb 100644 --- a/src/widgets/framelesswidget.cpp +++ b/src/widgets/framelesswidget.cpp @@ -27,10 +27,11 @@ #include "framelesswidgetshelper.h" #include "widgetssharedhelper_p.h" #include +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessWidget, "wangwenx190.framelesshelper.widgets.framelesswidget") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcFramelessWidget, "wangwenx190.framelesshelper.widgets.framelesswidget") #ifdef FRAMELESSHELPER_WIDGETS_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/widgets/framelesswidgetshelper.cpp b/src/widgets/framelesswidgetshelper.cpp index d92ca3f..d23a506 100644 --- a/src/widgets/framelesswidgetshelper.cpp +++ b/src/widgets/framelesswidgetshelper.cpp @@ -31,15 +31,16 @@ #include "framelessdialog.h" #include "framelessdialog_p.h" #include "widgetssharedhelper_p.h" -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #ifndef QWIDGETSIZE_MAX # define QWIDGETSIZE_MAX ((1 << 24) - 1) @@ -47,7 +48,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcFramelessWidgetsHelper, "wangwenx190.framelesshelper.widgets.framelesswidgetshelper") +static Q_LOGGING_CATEGORY(lcFramelessWidgetsHelper, "wangwenx190.framelesshelper.widgets.framelesswidgetshelper") #ifdef FRAMELESSHELPER_WIDGETS_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/widgets/standardsystembutton.cpp b/src/widgets/standardsystembutton.cpp index 851b824..460e35f 100644 --- a/src/widgets/standardsystembutton.cpp +++ b/src/widgets/standardsystembutton.cpp @@ -24,15 +24,16 @@ #include "standardsystembutton.h" #include "standardsystembutton_p.h" +#include +#include +#include #include #include #include -#include -#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcStandardSystemButton, "wangwenx190.framelesshelper.widgets.standardsystembutton") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcStandardSystemButton, "wangwenx190.framelesshelper.widgets.standardsystembutton") #ifdef FRAMELESSHELPER_WIDGETS_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/widgets/standardtitlebar.cpp b/src/widgets/standardtitlebar.cpp index 037842d..4fcd4d1 100644 --- a/src/widgets/standardtitlebar.cpp +++ b/src/widgets/standardtitlebar.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -36,7 +37,7 @@ FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcStandardTitleBar, "wangwenx190.framelesshelper.widgets.standardtitlebar") +static Q_LOGGING_CATEGORY(lcStandardTitleBar, "wangwenx190.framelesshelper.widgets.standardtitlebar") #ifdef FRAMELESSHELPER_WIDGETS_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO() diff --git a/src/widgets/widgetssharedhelper.cpp b/src/widgets/widgetssharedhelper.cpp index 7417f05..4682f2d 100644 --- a/src/widgets/widgetssharedhelper.cpp +++ b/src/widgets/widgetssharedhelper.cpp @@ -23,11 +23,6 @@ */ #include "widgetssharedhelper_p.h" -#include -#include -#include -#include -#include #include #include #include @@ -36,10 +31,16 @@ #ifdef Q_OS_WINDOWS # include #endif // Q_OS_WINDOWS +#include +#include +#include +#include +#include +#include FRAMELESSHELPER_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcWidgetsSharedHelper, "wangwenx190.framelesshelper.widgets.widgetssharedhelper") +[[maybe_unused]] static Q_LOGGING_CATEGORY(lcWidgetsSharedHelper, "wangwenx190.framelesshelper.widgets.widgetssharedhelper") #ifdef FRAMELESSHELPER_WIDGETS_NO_DEBUG_OUTPUT # define INFO QT_NO_QDEBUG_MACRO()