From 28907c75d81ba6139046aad5f0df95b81920c06c Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 24 Mar 2022 08:50:53 +0100 Subject: [PATCH] QskStandardSymbol as namespace --- qmlexport/QskQml.cpp | 2 -- src/graphic/QskStandardSymbol.h | 11 +++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/qmlexport/QskQml.cpp b/qmlexport/QskQml.cpp index eefde44e..4cbbd7ea 100644 --- a/qmlexport/QskQml.cpp +++ b/qmlexport/QskQml.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -194,7 +193,6 @@ void QskQml::registerTypes() #endif QSK_REGISTER_GADGET( QskRgbValueQml, "RgbValue" ); - QSK_REGISTER_GADGET( QskStandardSymbol, "StandardSymbol" ); QSK_REGISTER_GADGET( QskBoxBorderMetrics, "BorderMetrics" ); QSK_REGISTER_GADGET( QskBoxShapeMetrics, "Shape" ); QSK_REGISTER_GADGET( QskShadowMetrics, "ShadowMetrics" ); diff --git a/src/graphic/QskStandardSymbol.h b/src/graphic/QskStandardSymbol.h index 32223cf2..dde16e18 100644 --- a/src/graphic/QskStandardSymbol.h +++ b/src/graphic/QskStandardSymbol.h @@ -11,11 +11,10 @@ class QskGraphic; -class QSK_EXPORT QskStandardSymbol +namespace QskStandardSymbol { - Q_GADGET + QSK_EXPORT Q_NAMESPACE - public: enum Type { NoSymbol = -1, @@ -31,9 +30,9 @@ class QSK_EXPORT QskStandardSymbol SymbolTypeCount }; - Q_ENUM( Type ) + Q_ENUM_NS( Type ) - static QskGraphic graphic( Type ); -}; + QSK_EXPORT QskGraphic graphic( Type ); +} #endif