From a27554bfb217f6cd9aa9167469cfc7dc82109594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Fri, 17 May 2024 21:27:41 +0800 Subject: [PATCH] update --- src/FluApp.cpp | 2 +- src/FluentIconDef.h | 6 +++--- src/FluentUI.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/FluApp.cpp b/src/FluApp.cpp index a789365a..da3ab8d6 100644 --- a/src/FluApp.cpp +++ b/src/FluApp.cpp @@ -34,7 +34,7 @@ void FluApp::init(QObject *launcher, QLocale locale) { [[maybe_unused]] QJsonArray FluApp::iconData(const QString &keyword) { QJsonArray arr; - QMetaEnum enumType = Fluent_Icons::staticMetaObject.enumerator(Fluent_Icons::staticMetaObject.indexOfEnumerator("Fluent_IconType")); + QMetaEnum enumType = FluentIcons::staticMetaObject.enumerator(FluentIcons::staticMetaObject.indexOfEnumerator("Type")); for (int i = 0; i <= enumType.keyCount() - 1; ++i) { QString name = enumType.key(i); int icon = enumType.value(i); diff --git a/src/FluentIconDef.h b/src/FluentIconDef.h index 300d23bd..5fd61afd 100644 --- a/src/FluentIconDef.h +++ b/src/FluentIconDef.h @@ -3,9 +3,9 @@ #include #include -namespace Fluent_Icons { +namespace FluentIcons { Q_NAMESPACE - enum class Fluent_IconType { + enum class Type { GlobalNavButton = 0xe700, Wifi = 0xe701, Bluetooth = 0xe702, @@ -1411,7 +1411,7 @@ namespace Fluent_Icons { ClickedOutLoudSolidBold = 0xf8b3 }; - Q_ENUM_NS(Fluent_IconType) + Q_ENUM_NS(Type) QML_NAMED_ELEMENT(FluentIcons) } diff --git a/src/FluentUI.cpp b/src/FluentUI.cpp index aa0842a2..28a97aca 100644 --- a/src/FluentUI.cpp +++ b/src/FluentUI.cpp @@ -136,7 +136,7 @@ void FluentUI::registerTypes(const char *uri) const { qmlRegisterSingletonType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluRouter.qml"), uri, major, minor, "FluRouter"); qmlRegisterSingletonType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluEventBus.qml"), uri, major, minor, "FluEventBus"); - qmlRegisterUncreatableMetaObject(Fluent_Icons::staticMetaObject, uri, major, minor, "FluentIcons", "Access to enums & flags only"); + qmlRegisterUncreatableMetaObject(FluentIcons::staticMetaObject, uri, major, minor, "FluentIcons", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluThemeType::staticMetaObject, uri, major, minor, "FluThemeType", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluPageType::staticMetaObject, uri, major, minor, "FluPageType", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluWindowType::staticMetaObject, uri, major, minor, "FluWindowType", "Access to enums & flags only");