From eb6fc550063bae72a431cf2b662995ac1e84cce9 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Fri, 13 Jan 2023 17:47:37 +0800 Subject: [PATCH] quick: remove unneeded enums, fix warning Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- .../Quick/framelesshelperquick_global.h | 57 ------------------- src/quick/framelesshelperquick_global.cpp | 7 --- 2 files changed, 64 deletions(-) diff --git a/include/FramelessHelper/Quick/framelesshelperquick_global.h b/include/FramelessHelper/Quick/framelesshelperquick_global.h index 988f187..361c7d7 100644 --- a/include/FramelessHelper/Quick/framelesshelperquick_global.h +++ b/include/FramelessHelper/Quick/framelesshelperquick_global.h @@ -113,17 +113,6 @@ public: }; Q_ENUM(SystemButtonType) -#ifdef Q_OS_WINDOWS - enum class DwmColorizationArea - { - FRAMELESSHELPER_QUICK_ENUM_VALUE(DwmColorizationArea, None) - FRAMELESSHELPER_QUICK_ENUM_VALUE(DwmColorizationArea, StartMenu_TaskBar_ActionCenter) - FRAMELESSHELPER_QUICK_ENUM_VALUE(DwmColorizationArea, TitleBar_WindowBorder) - FRAMELESSHELPER_QUICK_ENUM_VALUE(DwmColorizationArea, All) - }; - Q_ENUM(DwmColorizationArea) -#endif // Q_OS_WINDOWS - enum class ButtonState { FRAMELESSHELPER_QUICK_ENUM_VALUE(ButtonState, Unspecified) @@ -133,44 +122,6 @@ public: }; Q_ENUM(ButtonState) -#ifdef Q_OS_WINDOWS - enum class WindowsVersion - { - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _2000) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _XP) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _XP_64) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _WS_03) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _Vista) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _Vista_SP1) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _Vista_SP2) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _7) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _7_SP1) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _8) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _8_1) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _8_1_Update1) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_1507) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_1511) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_1607) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_1703) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_1709) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_1803) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_1809) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_1903) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_1909) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_2004) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_20H2) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_21H1) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_21H2) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10_22H2) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _10) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _11_21H2) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _11_22H2) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, _11) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowsVersion, Latest) - }; - Q_ENUM(WindowsVersion) -#endif // Q_OS_WINDOWS - enum class BlurMode { FRAMELESSHELPER_QUICK_ENUM_VALUE(BlurMode, Disable) @@ -192,14 +143,6 @@ public: Q_ENUM(WindowEdge) Q_DECLARE_FLAGS(WindowEdges, WindowEdge) Q_FLAG(WindowEdges) - - enum class WindowCornerStyle - { - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowCornerStyle, Default) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowCornerStyle, Square) - FRAMELESSHELPER_QUICK_ENUM_VALUE(WindowCornerStyle, Round) - }; - Q_ENUM(WindowCornerStyle) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QuickGlobal::WindowEdges) diff --git a/src/quick/framelesshelperquick_global.cpp b/src/quick/framelesshelperquick_global.cpp index 3f745e6..0b050ad 100644 --- a/src/quick/framelesshelperquick_global.cpp +++ b/src/quick/framelesshelperquick_global.cpp @@ -81,17 +81,10 @@ void initialize() qRegisterMetaType(); qRegisterMetaType(); -#ifdef Q_OS_WINDOWS - qRegisterMetaType(); -#endif qRegisterMetaType(); -#ifdef Q_OS_WINDOWS - qRegisterMetaType(); -#endif qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType(); - qRegisterMetaType(); #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) qRegisterMetaType();