From 3d42f98017f040f92dc7b6f8295e6f8ad74aa8fd Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 23 Apr 2018 18:02:55 +0200 Subject: [PATCH] Core: Make IOptionsPageProvider::categoryIcon a Utils::Icon ...just like it is with IOptionsPage Change-Id: I033891f1a908be24b05103cb13a4ef628994d2a7 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/dialogs/ioptionspage.cpp | 2 +- src/plugins/coreplugin/dialogs/ioptionspage.h | 4 ++-- src/plugins/designer/designerconstants.h | 1 - src/plugins/designer/settingspage.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp index 6a336a55501..86281fb01a9 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.cpp +++ b/src/plugins/coreplugin/dialogs/ioptionspage.cpp @@ -211,5 +211,5 @@ const QList Core::IOptionsPageProvider::allOptions QIcon Core::IOptionsPageProvider::categoryIcon() const { - return QIcon(m_categoryIcon); + return m_categoryIcon.icon(); } diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index 7f55c25c884..be4010dcd5e 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -105,11 +105,11 @@ public: protected: void setCategory(Id category) { m_category = category; } void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; } - void setCategoryIcon(const QString &categoryIcon) { m_categoryIcon = categoryIcon; } + void setCategoryIcon(const Utils::Icon &categoryIcon) { m_categoryIcon = categoryIcon; } Id m_category; QString m_displayCategory; - QString m_categoryIcon; + Utils::Icon m_categoryIcon; }; } // namespace Core diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h index a097a991d09..62497bf945a 100644 --- a/src/plugins/designer/designerconstants.h +++ b/src/plugins/designer/designerconstants.h @@ -36,7 +36,6 @@ const char C_DESIGNER_XML_EDITOR[] = "Designer Xml Editor"; const char C_DESIGNER_XML_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Designer", "Form Editor"); const char SETTINGS_CATEGORY[] = "P.Designer"; -const char SETTINGS_CATEGORY_ICON[] = ":/core/images/category_design.png"; const char SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Designer", "Designer"); // Context diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index 15275ce8630..078c8e0bda2 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -72,7 +72,7 @@ SettingsPageProvider::SettingsPageProvider(QObject *parent) setCategory(Designer::Constants::SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Designer", Designer::Constants::SETTINGS_TR_CATEGORY)); - setCategoryIcon(Designer::Constants::SETTINGS_CATEGORY_ICON); + setCategoryIcon(Utils::Icon(":/core/images/category_design.png")); } QList SettingsPageProvider::pages() const