github_mirror
/
framelesshelper
mirror of https://github.com/wangwenx190/framelesshelper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

moc: code cleanup

This commit is contained in:
Zhao Yuhang 2023-11-03 20:35:34 +08:00
parent 79a9327c01
commit a6c7b44b5d
49 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -221,6 +221,20 @@ add_project_config(KEY "system_button" CONDITION NOT FRAMELESSHELPER_NO_SYSTEM_B
add_project_config(KEY "native_impl" CONDITION FRAMELESSHELPER_NATIVE_IMPL) add_project_config(KEY "native_impl" CONDITION FRAMELESSHELPER_NATIVE_IMPL)
generate_project_config(PATH "${FRAMELESSHELPER_CONFIG_FILE}") generate_project_config(PATH "${FRAMELESSHELPER_CONFIG_FILE}")
function(setup_custom_moc_macros)
cmake_parse_arguments(arg "" "" "TARGETS" ${ARGN})
if(arg_UNPARSED_ARGUMENTS)
message(AUTHOR_WARNING "setup_custom_moc_macros: Unrecognized arguments: ${arg_UNPARSED_ARGUMENTS}")
endif()
foreach(__target ${arg_TARGETS})
if(NOT TARGET ${__target})
message(AUTHOR_WARNING "${__target} is not a valid CMake target!")
continue()
endif()
set_property(TARGET ${__target} APPEND PROPERTY AUTOMOC_MACRO_NAMES "FRAMELESSHELPER_QT_CLASS;FRAMELESSHELPER_PUBLIC_QT_CLASS;FRAMELESSHELPER_PRIVATE_QT_CLASS")
endforeach()
endfunction()
if(FRAMELESSHELPER_BUILD_WIDGETS OR FRAMELESSHELPER_BUILD_QUICK) if(FRAMELESSHELPER_BUILD_WIDGETS OR FRAMELESSHELPER_BUILD_QUICK)
add_subdirectory(src) add_subdirectory(src)
endif() endif()

1
include/FramelessHelper/Core/chromepalette.h
View File

@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class ChromePalettePrivate; class ChromePalettePrivate;
class FRAMELESSHELPER_CORE_API ChromePalette : public QObject class FRAMELESSHELPER_CORE_API ChromePalette : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(ChromePalette) FRAMELESSHELPER_PUBLIC_QT_CLASS(ChromePalette)
Q_PROPERTY(QColor titleBarActiveBackgroundColor READ titleBarActiveBackgroundColor Q_PROPERTY(QColor titleBarActiveBackgroundColor READ titleBarActiveBackgroundColor

1
include/FramelessHelper/Core/framelesshelper_qt.h
View File

@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FramelessHelperQtPrivate; class FramelessHelperQtPrivate;
class FRAMELESSHELPER_CORE_API FramelessHelperQt : public QObject class FRAMELESSHELPER_CORE_API FramelessHelperQt : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessHelperQt) FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessHelperQt)
public: public:

1
include/FramelessHelper/Core/framelesshelpercore_global.h
View File

@ -316,6 +316,7 @@ QT_END_NAMESPACE
#ifndef FRAMELESSHELPER_QT_CLASS #ifndef FRAMELESSHELPER_QT_CLASS
# define FRAMELESSHELPER_QT_CLASS(Class) \ # define FRAMELESSHELPER_QT_CLASS(Class) \
private: \ private: \
Q_OBJECT \
FRAMELESSHELPER_CLASS_INFO \ FRAMELESSHELPER_CLASS_INFO \
FRAMELESSHELPER_CLASS(Class) FRAMELESSHELPER_CLASS(Class)
#endif #endif

1
include/FramelessHelper/Core/framelessmanager.h
View File

@ -32,7 +32,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FramelessManagerPrivate; class FramelessManagerPrivate;
class FRAMELESSHELPER_CORE_API FramelessManager : public QObject class FRAMELESSHELPER_CORE_API FramelessManager : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessManager) FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessManager)
Q_PROPERTY(Global::SystemTheme systemTheme READ systemTheme WRITE setOverrideTheme NOTIFY systemThemeChanged FINAL) Q_PROPERTY(Global::SystemTheme systemTheme READ systemTheme WRITE setOverrideTheme NOTIFY systemThemeChanged FINAL)
Q_PROPERTY(QColor systemAccentColor READ systemAccentColor NOTIFY systemThemeChanged FINAL) Q_PROPERTY(QColor systemAccentColor READ systemAccentColor NOTIFY systemThemeChanged FINAL)

1
include/FramelessHelper/Core/micamaterial.h
View File

@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class MicaMaterialPrivate; class MicaMaterialPrivate;
class FRAMELESSHELPER_CORE_API MicaMaterial : public QObject class FRAMELESSHELPER_CORE_API MicaMaterial : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(MicaMaterial) FRAMELESSHELPER_PUBLIC_QT_CLASS(MicaMaterial)
Q_PROPERTY(QColor tintColor READ tintColor WRITE setTintColor NOTIFY tintColorChanged FINAL) Q_PROPERTY(QColor tintColor READ tintColor WRITE setTintColor NOTIFY tintColorChanged FINAL)

1
include/FramelessHelper/Core/private/chromepalette_p.h
View File

@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class ChromePalette; class ChromePalette;
class FRAMELESSHELPER_CORE_API ChromePalettePrivate : public QObject class FRAMELESSHELPER_CORE_API ChromePalettePrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(ChromePalette) FRAMELESSHELPER_PRIVATE_QT_CLASS(ChromePalette)
public: public:

1
include/FramelessHelper/Core/private/framelessconfig_p.h
View File

@ -30,7 +30,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_CORE_API FramelessConfig : public QObject class FRAMELESSHELPER_CORE_API FramelessConfig : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(FramelessConfig) FRAMELESSHELPER_QT_CLASS(FramelessConfig)
public: public:

1
include/FramelessHelper/Core/private/framelessmanager_p.h
View File

@ -36,7 +36,6 @@ using FramelessDataPtr = std::shared_ptr<FramelessData>;
class FramelessManager; class FramelessManager;
class FRAMELESSHELPER_CORE_API FramelessManagerPrivate : public QObject class FRAMELESSHELPER_CORE_API FramelessManagerPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessManager) FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessManager)
public: public:

1
include/FramelessHelper/Core/private/micamaterial_p.h
View File

@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class MicaMaterial; class MicaMaterial;
class FRAMELESSHELPER_CORE_API MicaMaterialPrivate : public QObject class FRAMELESSHELPER_CORE_API MicaMaterialPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(MicaMaterial) FRAMELESSHELPER_PRIVATE_QT_CLASS(MicaMaterial)
public: public:

1
include/FramelessHelper/Core/private/registrykey_p.h
View File

@ -60,7 +60,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_CORE_API RegistryKey : public QObject class FRAMELESSHELPER_CORE_API RegistryKey : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(RegistryKey) FRAMELESSHELPER_QT_CLASS(RegistryKey)
public: public:

1
include/FramelessHelper/Core/private/sysapiloader_p.h
View File

@ -30,7 +30,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_CORE_API SysApiLoader : public QObject class FRAMELESSHELPER_CORE_API SysApiLoader : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(SysApiLoader) FRAMELESSHELPER_QT_CLASS(SysApiLoader)
public: public:

1
include/FramelessHelper/Core/private/windowborderpainter_p.h
View File

@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class WindowBorderPainter; class WindowBorderPainter;
class FRAMELESSHELPER_CORE_API WindowBorderPainterPrivate : public QObject class FRAMELESSHELPER_CORE_API WindowBorderPainterPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(WindowBorderPainter) FRAMELESSHELPER_PRIVATE_QT_CLASS(WindowBorderPainter)
public: public:

1
include/FramelessHelper/Core/windowborderpainter.h
View File

@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class WindowBorderPainterPrivate; class WindowBorderPainterPrivate;
class FRAMELESSHELPER_CORE_API WindowBorderPainter : public QObject class FRAMELESSHELPER_CORE_API WindowBorderPainter : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(WindowBorderPainter) FRAMELESSHELPER_PUBLIC_QT_CLASS(WindowBorderPainter)
Q_PROPERTY(int thickness READ thickness WRITE setThickness NOTIFY thicknessChanged FINAL) Q_PROPERTY(int thickness READ thickness WRITE setThickness NOTIFY thicknessChanged FINAL)

1
include/FramelessHelper/Quick/framelesshelperquick_global.h
View File

@ -87,7 +87,6 @@ FRAMELESSHELPER_QUICK_API void FramelessHelperQuickRegisterTypes(QQmlEngine *);
class FRAMELESSHELPER_QUICK_API QuickGlobal : public QObject class FRAMELESSHELPER_QUICK_API QuickGlobal : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(QuickGlobal) FRAMELESSHELPER_QT_CLASS(QuickGlobal)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT
QML_NAMED_ELEMENT(FramelessHelperConstants) QML_NAMED_ELEMENT(FramelessHelperConstants)

1
include/FramelessHelper/Quick/framelessquickhelper.h
View File

@ -41,7 +41,6 @@ class QuickWindowBorder;
class FramelessQuickHelperPrivate; class FramelessQuickHelperPrivate;
class FRAMELESSHELPER_QUICK_API FramelessQuickHelper : public QQuickItem class FRAMELESSHELPER_QUICK_API FramelessQuickHelper : public QQuickItem
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickHelper) FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickHelper)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT
QML_NAMED_ELEMENT(FramelessHelper) QML_NAMED_ELEMENT(FramelessHelper)

1
include/FramelessHelper/Quick/framelessquickutils.h
View File

@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_QUICK_API FramelessQuickUtils : public QObject, public QQmlParserStatus class FRAMELESSHELPER_QUICK_API FramelessQuickUtils : public QObject, public QQmlParserStatus
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(FramelessQuickUtils) FRAMELESSHELPER_QT_CLASS(FramelessQuickUtils)
Q_INTERFACES(QQmlParserStatus) Q_INTERFACES(QQmlParserStatus)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT

1
include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h
View File

@ -36,7 +36,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FramelessQuickApplicationWindowPrivate; class FramelessQuickApplicationWindowPrivate;
class FRAMELESSHELPER_QUICK_API FramelessQuickApplicationWindow : public QQuickApplicationWindow class FRAMELESSHELPER_QUICK_API FramelessQuickApplicationWindow : public QQuickApplicationWindow
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickApplicationWindow) FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickApplicationWindow)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT
QML_NAMED_ELEMENT(FramelessApplicationWindow) QML_NAMED_ELEMENT(FramelessApplicationWindow)

1
include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p_p.h
View File

@ -39,7 +39,6 @@ class QuickWindowBorder;
class FramelessQuickApplicationWindow; class FramelessQuickApplicationWindow;
class FRAMELESSHELPER_QUICK_API FramelessQuickApplicationWindowPrivate : public QObject class FRAMELESSHELPER_QUICK_API FramelessQuickApplicationWindowPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickApplicationWindow) FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickApplicationWindow)
public: public:

1
include/FramelessHelper/Quick/private/framelessquickhelper_p.h
View File

@ -44,7 +44,6 @@ class QuickWindowBorder;
class FramelessQuickHelper; class FramelessQuickHelper;
class FRAMELESSHELPER_QUICK_API FramelessQuickHelperPrivate : public QObject class FRAMELESSHELPER_QUICK_API FramelessQuickHelperPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickHelper) FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickHelper)
public: public:

1
include/FramelessHelper/Quick/private/framelessquickwindow_p.h
View File

@ -36,7 +36,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FramelessQuickWindowPrivate; class FramelessQuickWindowPrivate;
class FRAMELESSHELPER_QUICK_API FramelessQuickWindow : public QQuickWindowQmlImpl class FRAMELESSHELPER_QUICK_API FramelessQuickWindow : public QQuickWindowQmlImpl
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickWindow) FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickWindow)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT
QML_NAMED_ELEMENT(FramelessWindow) QML_NAMED_ELEMENT(FramelessWindow)

1
include/FramelessHelper/Quick/private/framelessquickwindow_p_p.h
View File

@ -39,7 +39,6 @@ class QuickWindowBorder;
class FramelessQuickWindow; class FramelessQuickWindow;
class FRAMELESSHELPER_QUICK_API FramelessQuickWindowPrivate : public QObject class FRAMELESSHELPER_QUICK_API FramelessQuickWindowPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickWindow) FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickWindow)
public: public:

1
include/FramelessHelper/Quick/private/quickimageitem_p.h
View File

@ -32,7 +32,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_QUICK_API QuickImageItem : public QQuickPaintedItem class FRAMELESSHELPER_QUICK_API QuickImageItem : public QQuickPaintedItem
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(QuickImageItem) FRAMELESSHELPER_QT_CLASS(QuickImageItem)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT
QML_NAMED_ELEMENT(ImageItem) QML_NAMED_ELEMENT(ImageItem)

1
include/FramelessHelper/Quick/private/quickmicamaterial_p.h
View File

@ -35,7 +35,6 @@ class MicaMaterial;
class QuickMicaMaterial; class QuickMicaMaterial;
class FRAMELESSHELPER_QUICK_API QuickMicaMaterialPrivate : public QObject class FRAMELESSHELPER_QUICK_API QuickMicaMaterialPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(QuickMicaMaterial) FRAMELESSHELPER_PRIVATE_QT_CLASS(QuickMicaMaterial)
public: public:

1
include/FramelessHelper/Quick/private/quickstandardsystembutton_p.h
View File

@ -39,7 +39,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_QUICK_API QuickStandardSystemButton : public QQuickButton class FRAMELESSHELPER_QUICK_API QuickStandardSystemButton : public QQuickButton
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(QuickStandardSystemButton) FRAMELESSHELPER_QT_CLASS(QuickStandardSystemButton)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT
QML_NAMED_ELEMENT(StandardSystemButton) QML_NAMED_ELEMENT(StandardSystemButton)

1
include/FramelessHelper/Quick/private/quickstandardtitlebar_p.h
View File

@ -45,7 +45,6 @@ class QuickImageItem;
class FRAMELESSHELPER_QUICK_API QuickStandardTitleBar : public QQuickRectangle class FRAMELESSHELPER_QUICK_API QuickStandardTitleBar : public QQuickRectangle
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(QuickStandardTitleBar) FRAMELESSHELPER_QT_CLASS(QuickStandardTitleBar)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT
QML_NAMED_ELEMENT(StandardTitleBar) QML_NAMED_ELEMENT(StandardTitleBar)

1
include/FramelessHelper/Quick/private/quickwindowborder_p.h
View File

@ -35,7 +35,6 @@ class WindowBorderPainter;
class QuickWindowBorder; class QuickWindowBorder;
class FRAMELESSHELPER_QUICK_API QuickWindowBorderPrivate : public QObject class FRAMELESSHELPER_QUICK_API QuickWindowBorderPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(QuickWindowBorder) FRAMELESSHELPER_PRIVATE_QT_CLASS(QuickWindowBorder)
public: public:

1
include/FramelessHelper/Quick/quickchromepalette.h
View File

@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_QUICK_API QuickChromePalette : public ChromePalette, public QQmlParserStatus class FRAMELESSHELPER_QUICK_API QuickChromePalette : public ChromePalette, public QQmlParserStatus
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(QuickChromePalette) FRAMELESSHELPER_QT_CLASS(QuickChromePalette)
Q_INTERFACES(QQmlParserStatus) Q_INTERFACES(QQmlParserStatus)
#ifdef QML_ANONYMOUS #ifdef QML_ANONYMOUS

1
include/FramelessHelper/Quick/quickmicamaterial.h
View File

@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class QuickMicaMaterialPrivate; class QuickMicaMaterialPrivate;
class FRAMELESSHELPER_QUICK_API QuickMicaMaterial : public QQuickPaintedItem class FRAMELESSHELPER_QUICK_API QuickMicaMaterial : public QQuickPaintedItem
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(QuickMicaMaterial) FRAMELESSHELPER_PUBLIC_QT_CLASS(QuickMicaMaterial)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT
QML_NAMED_ELEMENT(MicaMaterial) QML_NAMED_ELEMENT(MicaMaterial)

1
include/FramelessHelper/Quick/quickwindowborder.h
View File

@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class QuickWindowBorderPrivate; class QuickWindowBorderPrivate;
class FRAMELESSHELPER_QUICK_API QuickWindowBorder : public QQuickPaintedItem class FRAMELESSHELPER_QUICK_API QuickWindowBorder : public QQuickPaintedItem
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(QuickWindowBorder) FRAMELESSHELPER_PUBLIC_QT_CLASS(QuickWindowBorder)
#ifdef QML_NAMED_ELEMENT #ifdef QML_NAMED_ELEMENT
QML_NAMED_ELEMENT(WindowBorder) QML_NAMED_ELEMENT(WindowBorder)

1
include/FramelessHelper/Widgets/framelessdialog.h
View File

@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FramelessDialogPrivate; class FramelessDialogPrivate;
class FRAMELESSHELPER_WIDGETS_API FramelessDialog : public QDialog class FRAMELESSHELPER_WIDGETS_API FramelessDialog : public QDialog
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessDialog) FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessDialog)
public: public:

1
include/FramelessHelper/Widgets/framelessmainwindow.h
View File

@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FramelessMainWindowPrivate; class FramelessMainWindowPrivate;
class FRAMELESSHELPER_WIDGETS_API FramelessMainWindow : public QMainWindow class FRAMELESSHELPER_WIDGETS_API FramelessMainWindow : public QMainWindow
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessMainWindow) FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessMainWindow)
Q_PROPERTY(bool hidden READ isHidden NOTIFY hiddenChanged FINAL) Q_PROPERTY(bool hidden READ isHidden NOTIFY hiddenChanged FINAL)
Q_PROPERTY(bool normal READ isNormal NOTIFY normalChanged FINAL) Q_PROPERTY(bool normal READ isNormal NOTIFY normalChanged FINAL)

1
include/FramelessHelper/Widgets/framelesswidget.h
View File

@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class FramelessWidgetPrivate; class FramelessWidgetPrivate;
class FRAMELESSHELPER_WIDGETS_API FramelessWidget : public QWidget class FRAMELESSHELPER_WIDGETS_API FramelessWidget : public QWidget
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessWidget) FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessWidget)
Q_PROPERTY(bool hidden READ isHidden NOTIFY hiddenChanged FINAL) Q_PROPERTY(bool hidden READ isHidden NOTIFY hiddenChanged FINAL)
Q_PROPERTY(bool normal READ isNormal NOTIFY normalChanged FINAL) Q_PROPERTY(bool normal READ isNormal NOTIFY normalChanged FINAL)

1
include/FramelessHelper/Widgets/framelesswidgetshelper.h
View File

@ -40,7 +40,6 @@ class WindowBorderPainter;
class FramelessWidgetsHelperPrivate; class FramelessWidgetsHelperPrivate;
class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelper : public QObject class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelper : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessWidgetsHelper) FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessWidgetsHelper)
Q_PROPERTY(QWidget* titleBarWidget READ titleBarWidget WRITE setTitleBarWidget NOTIFY titleBarWidgetChanged FINAL) Q_PROPERTY(QWidget* titleBarWidget READ titleBarWidget WRITE setTitleBarWidget NOTIFY titleBarWidgetChanged FINAL)
Q_PROPERTY(bool windowFixedSize READ isWindowFixedSize WRITE setWindowFixedSize NOTIFY windowFixedSizeChanged FINAL) Q_PROPERTY(bool windowFixedSize READ isWindowFixedSize WRITE setWindowFixedSize NOTIFY windowFixedSizeChanged FINAL)

1
include/FramelessHelper/Widgets/private/framelessdialog_p.h
View File

@ -35,7 +35,6 @@ class WidgetsSharedHelper;
class FramelessDialog; class FramelessDialog;
class FRAMELESSHELPER_WIDGETS_API FramelessDialogPrivate : public QObject class FRAMELESSHELPER_WIDGETS_API FramelessDialogPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessDialog) FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessDialog)
public: public:

1
include/FramelessHelper/Widgets/private/framelessmainwindow_p.h
View File

@ -35,7 +35,6 @@ class WidgetsSharedHelper;
class FramelessMainWindow; class FramelessMainWindow;
class FRAMELESSHELPER_WIDGETS_API FramelessMainWindowPrivate : public QObject class FRAMELESSHELPER_WIDGETS_API FramelessMainWindowPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessMainWindow) FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessMainWindow)
public: public:

1
include/FramelessHelper/Widgets/private/framelesswidget_p.h
View File

@ -35,7 +35,6 @@ class WidgetsSharedHelper;
class FramelessWidget; class FramelessWidget;
class FRAMELESSHELPER_WIDGETS_API FramelessWidgetPrivate : public QObject class FRAMELESSHELPER_WIDGETS_API FramelessWidgetPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessWidget) FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessWidget)
public: public:

1
include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h
View File

@ -42,7 +42,6 @@ class WidgetsSharedHelper;
class FramelessWidgetsHelper; class FramelessWidgetsHelper;
class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelperPrivate : public QObject class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelperPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessWidgetsHelper) FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessWidgetsHelper)
public: public:

1
include/FramelessHelper/Widgets/private/standardsystembutton_p.h
View File

@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class StandardSystemButton; class StandardSystemButton;
class FRAMELESSHELPER_WIDGETS_API StandardSystemButtonPrivate : public QObject class FRAMELESSHELPER_WIDGETS_API StandardSystemButtonPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(StandardSystemButton) FRAMELESSHELPER_PRIVATE_QT_CLASS(StandardSystemButton)
public: public:

1
include/FramelessHelper/Widgets/private/standardtitlebar_p.h
View File

@ -44,7 +44,6 @@ class ChromePalette;
class StandardTitleBar; class StandardTitleBar;
class FRAMELESSHELPER_WIDGETS_API StandardTitleBarPrivate : public QObject class FRAMELESSHELPER_WIDGETS_API StandardTitleBarPrivate : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_PRIVATE_QT_CLASS(StandardTitleBar) FRAMELESSHELPER_PRIVATE_QT_CLASS(StandardTitleBar)
public: public:

1
include/FramelessHelper/Widgets/private/widgetssharedhelper_p.h
View File

@ -38,7 +38,6 @@ class WindowBorderPainter;
class FRAMELESSHELPER_WIDGETS_API WidgetsSharedHelper : public QObject class FRAMELESSHELPER_WIDGETS_API WidgetsSharedHelper : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(WidgetsSharedHelper) FRAMELESSHELPER_QT_CLASS(WidgetsSharedHelper)
#if FRAMELESSHELPER_CONFIG(mica_material) #if FRAMELESSHELPER_CONFIG(mica_material)
Q_PROPERTY(bool micaEnabled READ isMicaEnabled WRITE setMicaEnabled NOTIFY micaEnabledChanged FINAL) Q_PROPERTY(bool micaEnabled READ isMicaEnabled WRITE setMicaEnabled NOTIFY micaEnabledChanged FINAL)

1
include/FramelessHelper/Widgets/standardsystembutton.h
View File

@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class StandardSystemButtonPrivate; class StandardSystemButtonPrivate;
class FRAMELESSHELPER_WIDGETS_API StandardSystemButton : public QPushButton class FRAMELESSHELPER_WIDGETS_API StandardSystemButton : public QPushButton
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(StandardSystemButton) FRAMELESSHELPER_PUBLIC_QT_CLASS(StandardSystemButton)
Q_PROPERTY(Global::SystemButtonType buttonType READ buttonType WRITE setButtonType NOTIFY buttonTypeChanged FINAL) Q_PROPERTY(Global::SystemButtonType buttonType READ buttonType WRITE setButtonType NOTIFY buttonTypeChanged FINAL)
Q_PROPERTY(QString glyph READ glyph WRITE setGlyph NOTIFY glyphChanged FINAL) Q_PROPERTY(QString glyph READ glyph WRITE setGlyph NOTIFY glyphChanged FINAL)

1
include/FramelessHelper/Widgets/standardtitlebar.h
View File

@ -40,7 +40,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
class StandardTitleBarPrivate; class StandardTitleBarPrivate;
class FRAMELESSHELPER_WIDGETS_API StandardTitleBar : public QWidget class FRAMELESSHELPER_WIDGETS_API StandardTitleBar : public QWidget
{ {
Q_OBJECT
FRAMELESSHELPER_PUBLIC_QT_CLASS(StandardTitleBar) FRAMELESSHELPER_PUBLIC_QT_CLASS(StandardTitleBar)
Q_PROPERTY(Qt::Alignment titleLabelAlignment READ titleLabelAlignment WRITE setTitleLabelAlignment NOTIFY titleLabelAlignmentChanged FINAL) Q_PROPERTY(Qt::Alignment titleLabelAlignment READ titleLabelAlignment WRITE setTitleLabelAlignment NOTIFY titleLabelAlignmentChanged FINAL)
#if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button)) #if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button))

1
src/core/CMakeLists.txt
View File

@ -281,6 +281,7 @@ if(NOT FRAMELESSHELPER_BUILD_STATIC)
endif() endif()
setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET}) setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET})
setup_custom_moc_macros(TARGETS ${SUB_MODULE_TARGET})
set(__extra_flags "") set(__extra_flags "")
if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS) if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)

2
src/core/framelessmanager.cpp
View File

@ -45,7 +45,6 @@
#include <QtCore/qloggingcategory.h> #include <QtCore/qloggingcategory.h>
#include <QtGui/qfontdatabase.h> #include <QtGui/qfontdatabase.h>
#include <QtGui/qwindow.h> #include <QtGui/qwindow.h>
#include <QtGui/qevent.h>
#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
# include <QtGui/qguiapplication.h> # include <QtGui/qguiapplication.h>
# include <QtGui/qstylehints.h> # include <QtGui/qstylehints.h>
@ -108,7 +107,6 @@ Q_GLOBAL_STATIC(InternalData, g_internalData)
class InternalEventFilter : public QObject class InternalEventFilter : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(InternalEventFilter) FRAMELESSHELPER_QT_CLASS(InternalEventFilter)
public: public:

1
src/core/micamaterial.cpp
View File

@ -492,7 +492,6 @@ static inline void expblur(QImage &img, qreal radius, const bool improvedQuality
class WallpaperThread : public FramelessHelperThreadClass class WallpaperThread : public FramelessHelperThreadClass
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(WallpaperThread) FRAMELESSHELPER_QT_CLASS(WallpaperThread)
public: public:

1
src/core/utils_mac.mm
View File

@ -222,7 +222,6 @@ private:
class NSWindowProxy : public QObject class NSWindowProxy : public QObject
{ {
Q_OBJECT
FRAMELESSHELPER_QT_CLASS(NSWindowProxy) FRAMELESSHELPER_QT_CLASS(NSWindowProxy)
public: public:

1
src/quick/CMakeLists.txt
View File

@ -261,6 +261,7 @@ if(NOT FRAMELESSHELPER_BUILD_STATIC)
endif() endif()
setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET} ALLOW_KEYWORD) setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET} ALLOW_KEYWORD)
setup_custom_moc_macros(TARGETS ${SUB_MODULE_TARGET})
set(__extra_flags "") set(__extra_flags "")
if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS) if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)

1
src/widgets/CMakeLists.txt
View File

@ -153,6 +153,7 @@ if(NOT FRAMELESSHELPER_BUILD_STATIC)
endif() endif()
setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET}) setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET})
setup_custom_moc_macros(TARGETS ${SUB_MODULE_TARGET})
set(__extra_flags "") set(__extra_flags "")
if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS) if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)