diff options
50 files changed, 58 insertions, 56 deletions
diff --git a/src/plugins/android/androidsettingspage.cpp b/src/plugins/android/androidsettingspage.cpp index c67db2af1ca..c737248e9de 100644 --- a/src/plugins/android/androidsettingspage.cpp +++ b/src/plugins/android/androidsettingspage.cpp @@ -45,7 +45,7 @@ AndroidSettingsPage::AndroidSettingsPage(QObject *parent) setCategory(Constants::ANDROID_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Android", Constants::ANDROID_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::ANDROID_SETTINGS_CATEGORY_ICON)); } QWidget *AndroidSettingsPage::widget() diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp index 3ef5c46e7fe..3dd382ed3e5 100644 --- a/src/plugins/autotest/testsettingspage.cpp +++ b/src/plugins/autotest/testsettingspage.cpp @@ -179,7 +179,7 @@ TestSettingsPage::TestSettingsPage(const QSharedPointer<TestSettings> &settings) setDisplayName(tr("General")); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setDisplayCategory(tr("Test Settings")); - setCategoryIcon(QLatin1String(":/images/autotest.png")); + setCategoryIcon(Utils::Icon(":/images/autotest.png")); } TestSettingsPage::~TestSettingsPage() diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp index 90f39ba3b23..d01bcddac15 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp @@ -414,7 +414,7 @@ GdbServerProvidersSettingsPage::GdbServerProvidersSettingsPage(QObject *parent) setCategory(Constants::BAREMETAL_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate( "BareMetal", Constants::BAREMETAL_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::BAREMETAL_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::BAREMETAL_SETTINGS_CATEGORY_ICON)); setId(Constants::GDB_PROVIDERS_SETTINGS_ID); setDisplayName(tr("GDB Server Providers")); } diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index dffc7cc5e36..a2086def126 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -92,7 +92,7 @@ ArtisticStyleOptionsPage::ArtisticStyleOptionsPage(ArtisticStyleSettings *settin setDisplayName(tr("Artistic Style")); setCategory(Constants::OPTION_CATEGORY); setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); - setCategoryIcon(Constants::OPTION_CATEGORY_ICON); + setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON)); } QWidget *ArtisticStyleOptionsPage::widget() diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index 15047b5c5bd..59f9ef5f5b2 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -98,7 +98,7 @@ ClangFormatOptionsPage::ClangFormatOptionsPage(ClangFormatSettings *settings, QO setDisplayName(tr("Clang Format")); setCategory(Constants::OPTION_CATEGORY); setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); - setCategoryIcon(Constants::OPTION_CATEGORY_ICON); + setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON)); } QWidget *ClangFormatOptionsPage::widget() diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp index be3e70b81b5..b4c620054e9 100644 --- a/src/plugins/beautifier/generaloptionspage.cpp +++ b/src/plugins/beautifier/generaloptionspage.cpp @@ -83,7 +83,7 @@ GeneralOptionsPage::GeneralOptionsPage(GeneralSettings *settings, const QStringL setDisplayName(tr("General")); setCategory(Constants::OPTION_CATEGORY); setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); - setCategoryIcon(Constants::OPTION_CATEGORY_ICON); + setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON)); } QWidget *GeneralOptionsPage::widget() diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp index ab2e79162b8..72687b70f4a 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp @@ -96,7 +96,7 @@ UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings, QObje setDisplayName(tr("Uncrustify")); setCategory(Constants::OPTION_CATEGORY); setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); - setCategoryIcon(Constants::OPTION_CATEGORY_ICON); + setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON)); } QWidget *UncrustifyOptionsPage::widget() diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp index 43691e4875c..33a121cbf28 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp @@ -71,7 +71,7 @@ public: "Clang Static Analyzer")); setCategory("T.Analyzer"); setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); - setCategoryIcon(QLatin1String(":/images/analyzer_category.png")); + setCategoryIcon(Utils::Icon(":/images/analyzer_category.png")); } QWidget *widget() diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index 8d966ae338a..dd540196d10 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -552,7 +552,7 @@ CMakeSettingsPage::CMakeSettingsPage() setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); } QWidget *CMakeSettingsPage::widget() diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp index 221a7496198..04a7b3131be 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.cpp +++ b/src/plugins/coreplugin/dialogs/ioptionspage.cpp @@ -78,7 +78,7 @@ QIcon Core::IOptionsPage::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 c27cec3c3a8..b726755b7b5 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -27,6 +27,8 @@ #include <coreplugin/id.h> +#include <utils/icon.h> + #include <QObject> #include <QStringList> @@ -61,13 +63,13 @@ protected: void setDisplayName(const QString &displayName) { m_displayName = displayName; } 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_id; Id m_category; QString m_displayName; QString m_displayCategory; - QString m_categoryIcon; + Utils::Icon m_categoryIcon; mutable bool m_keywordsInitialized; mutable QStringList m_keywords; diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 998c91685bb..ec1e5d0cee9 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -290,7 +290,7 @@ ShortcutSettings::ShortcutSettings(QObject *parent) setDisplayName(tr("Keyboard")); setCategory(Constants::SETTINGS_CATEGORY_CORE); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); } QWidget *ShortcutSettings::widget() diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 996d3f5b0ff..fcf8d07f96a 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -51,7 +51,7 @@ GeneralSettings::GeneralSettings() setDisplayName(tr("Interface")); setCategory(Constants::SETTINGS_CATEGORY_CORE); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); } static bool hasQmFilesForLocale(const QString &locale, const QString &creatorTrPath) diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.cpp b/src/plugins/coreplugin/locator/locatorsettingspage.cpp index a52545172a1..4f69cc2b437 100644 --- a/src/plugins/coreplugin/locator/locatorsettingspage.cpp +++ b/src/plugins/coreplugin/locator/locatorsettingspage.cpp @@ -167,7 +167,7 @@ LocatorSettingsPage::LocatorSettingsPage(Locator *plugin) setDisplayName(QCoreApplication::translate("Locator", Constants::FILTER_OPTIONS_PAGE)); setCategory(Constants::SETTINGS_CATEGORY_CORE); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); } QWidget *LocatorSettingsPage::widget() diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index 77e82e50455..afd7fb49510 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -565,7 +565,7 @@ MimeTypeSettings::MimeTypeSettings(QObject *parent) setCategory(Constants::SETTINGS_CATEGORY_CORE); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); } MimeTypeSettings::~MimeTypeSettings() diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp index 7ceb9de6f9b..ec0df193655 100644 --- a/src/plugins/coreplugin/systemsettings.cpp +++ b/src/plugins/coreplugin/systemsettings.cpp @@ -55,7 +55,7 @@ SystemSettings::SystemSettings() setDisplayName(tr("System")); setCategory(Constants::SETTINGS_CATEGORY_CORE); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); connect(VcsManager::instance(), &VcsManager::configurationChanged, this, &SystemSettings::updatePath); diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp index 44021d6557c..764cbfab6f3 100644 --- a/src/plugins/coreplugin/toolsettings.cpp +++ b/src/plugins/coreplugin/toolsettings.cpp @@ -48,7 +48,7 @@ ToolSettings::ToolSettings(QObject *parent) : setDisplayName(tr("External Tools")); setCategory(Constants::SETTINGS_CATEGORY_CORE); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); } diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index e2c70fd3c82..0926b498873 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -70,7 +70,7 @@ SettingsPage::SettingsPage(const QSharedPointer<Settings> &settings) : setCategory(Constants::CPASTER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CodePaster", Constants::CPASTER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPASTER_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPASTER_ICON)); } SettingsPage::~SettingsPage() diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp index c3addc400b1..e1792ed0b71 100644 --- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp +++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp @@ -167,7 +167,7 @@ CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSe setDisplayName(QCoreApplication::translate("CppTools",Constants::CPP_CODE_MODEL_SETTINGS_NAME)); setCategory(Constants::CPP_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CppTools",Constants::CPP_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON)); } QWidget *CppCodeModelSettingsPage::widget() diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 46d6ee69850..541d950fddf 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp @@ -525,7 +525,7 @@ CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) : setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME)); setCategory(Constants::CPP_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON)); } QWidget *CppCodeStyleSettingsPage::widget() diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index d46eae8318b..4fcc68c6dc6 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -363,7 +363,7 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME)); setCategory(Constants::CPP_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON)); } QWidget *CppFileSettingsPage::widget() diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp index 43f3c2c143a..b5093991f29 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.cpp +++ b/src/plugins/debugger/cdb/cdboptionspage.cpp @@ -202,7 +202,7 @@ CdbOptionsPage::CdbOptionsPage() setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } CdbOptionsPage::~CdbOptionsPage() @@ -281,7 +281,7 @@ CdbPathsPage::CdbPathsPage() setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } CdbPathsPage::~CdbPathsPage() diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index d97a9df0b39..96977c9fc8f 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -260,7 +260,7 @@ CommonOptionsPage::CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions> setDisplayName(QCoreApplication::translate("Debugger", "General")); setCategory(DEBUGGER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } CommonOptionsPage::~CommonOptionsPage() @@ -331,7 +331,7 @@ LocalsAndExpressionsOptionsPage::LocalsAndExpressionsOptionsPage() setDisplayName(QCoreApplication::translate("Debugger", "Locals && Expressions")); setCategory(DEBUGGER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } void LocalsAndExpressionsOptionsPage::apply() diff --git a/src/plugins/debugger/debuggeroptionspage.cpp b/src/plugins/debugger/debuggeroptionspage.cpp index ab02978a26b..72af792a426 100644 --- a/src/plugins/debugger/debuggeroptionspage.cpp +++ b/src/plugins/debugger/debuggeroptionspage.cpp @@ -500,7 +500,7 @@ DebuggerOptionsPage::DebuggerOptionsPage() setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); } QWidget *DebuggerOptionsPage::widget() diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp index 4e5aa808431..d1fcb22b1b3 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.cpp +++ b/src/plugins/debugger/gdb/gdboptionspage.cpp @@ -302,7 +302,7 @@ GdbOptionsPage::GdbOptionsPage() setDisplayName(tr("GDB")); setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } QWidget *GdbOptionsPage::widget() @@ -453,7 +453,7 @@ GdbOptionsPage2::GdbOptionsPage2() setDisplayName(tr("GDB Extended")); setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } QWidget *GdbOptionsPage2::widget() diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index b4419affd18..0730e5fec59 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -41,7 +41,7 @@ SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) : setCategory(Designer::Constants::SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Designer", Designer::Constants::SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Designer::Constants::SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Designer::Constants::SETTINGS_CATEGORY_ICON)); } QWidget *SettingsPage::widget() diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 162848adfed..b049aa2d965 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -362,7 +362,7 @@ public: setDisplayName(Tr::tr("General")); setCategory(SETTINGS_CATEGORY); setDisplayCategory(Tr::tr("FakeVim")); - setCategoryIcon(SETTINGS_CATEGORY_FAKEVIM_ICON); + setCategoryIcon(Utils::Icon(SETTINGS_CATEGORY_FAKEVIM_ICON)); } QWidget *widget(); @@ -596,7 +596,7 @@ public: setDisplayName(Tr::tr("Ex Command Mapping")); setCategory(SETTINGS_CATEGORY); setDisplayCategory(Tr::tr("FakeVim")); - setCategoryIcon(SETTINGS_CATEGORY_FAKEVIM_ICON); + setCategoryIcon(Utils::Icon(SETTINGS_CATEGORY_FAKEVIM_ICON)); } QWidget *widget() override; @@ -810,7 +810,7 @@ public: setDisplayName(Tr::tr("User Command Mapping")); setCategory(SETTINGS_CATEGORY); setDisplayCategory(Tr::tr("FakeVim")); - setCategoryIcon(SETTINGS_CATEGORY_FAKEVIM_ICON); + setCategoryIcon(Utils::Icon(SETTINGS_CATEGORY_FAKEVIM_ICON)); } void apply(); diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index cedf36ac1bd..e34f65b253a 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -135,7 +135,7 @@ DocSettingsPage::DocSettingsPage() setDisplayName(tr("Documentation")); setCategory(Help::Constants::HELP_CATEGORY); setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY)); - setCategoryIcon(Help::Constants::HELP_CATEGORY_ICON); + setCategoryIcon(Utils::Icon(Help::Constants::HELP_CATEGORY_ICON)); } QWidget *DocSettingsPage::widget() diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index 2c74ee78a23..ba0ba5c9a6f 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -44,7 +44,7 @@ FilterSettingsPage::FilterSettingsPage() setDisplayName(tr("Filters")); setCategory(Help::Constants::HELP_CATEGORY); setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY)); - setCategoryIcon(Help::Constants::HELP_CATEGORY_ICON); + setCategoryIcon(Utils::Icon(Help::Constants::HELP_CATEGORY_ICON)); } QWidget *FilterSettingsPage::widget() diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index a4dafc1ece3..8001a8c9f01 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -56,7 +56,7 @@ GeneralSettingsPage::GeneralSettingsPage() setDisplayName(tr("General")); setCategory(Help::Constants::HELP_CATEGORY); setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY)); - setCategoryIcon(Help::Constants::HELP_CATEGORY_ICON); + setCategoryIcon(Utils::Icon(Help::Constants::HELP_CATEGORY_ICON)); } QWidget *GeneralSettingsPage::widget() diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp index db74f5c9b0e..84e103deb07 100644 --- a/src/plugins/ios/iossettingspage.cpp +++ b/src/plugins/ios/iossettingspage.cpp @@ -41,7 +41,7 @@ IosSettingsPage::IosSettingsPage(QObject *parent) setCategory(Constants::IOS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("iOS", Constants::IOS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::IOS_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(QLatin1String(Constants::IOS_SETTINGS_CATEGORY_ICON))); } QWidget *IosSettingsPage::widget() diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp index 4da3ab91b96..5eda9568f8a 100644 --- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp +++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp @@ -51,7 +51,7 @@ NimCodeStyleSettingsPage::NimCodeStyleSettingsPage(QWidget *parent) setDisplayName(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_DISPLAY)); setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY); setDisplayCategory(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY_DISPLAY)); - setCategoryIcon(QLatin1String(Nim::Constants::C_NIM_ICON_PATH)); + setCategoryIcon(Utils::Icon(Nim::Constants::C_NIM_ICON_PATH)); } NimCodeStyleSettingsPage::~NimCodeStyleSettingsPage() diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp index 04077e1234f..3958b9d3857 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp @@ -42,7 +42,7 @@ DeviceSettingsPage::DeviceSettingsPage(QObject *parent) setDisplayName(tr("Devices")); setCategory(Constants::DEVICE_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Devices")); - setCategoryIcon(QLatin1String(":/projectexplorer/images/MaemoDevice.png")); + setCategoryIcon(Utils::Icon(":/projectexplorer/images/MaemoDevice.png")); } QWidget *DeviceSettingsPage::widget() diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp index 360b1cd13e1..418e1abe4ec 100644 --- a/src/plugins/projectexplorer/kitoptionspage.cpp +++ b/src/plugins/projectexplorer/kitoptionspage.cpp @@ -241,7 +241,7 @@ KitOptionsPage::KitOptionsPage() setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); } QWidget *KitOptionsPage::widget() diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 12c6b10fdc0..115413b47a5 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -188,7 +188,7 @@ ProjectExplorerSettingsPage::ProjectExplorerSettingsPage() setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); } QWidget *ProjectExplorerSettingsPage::widget() diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 4482f4221af..1d2bcad6a9b 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -438,7 +438,7 @@ ToolChainOptionsPage::ToolChainOptionsPage() setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); } QWidget *ToolChainOptionsPage::widget() diff --git a/src/plugins/qbsprojectmanager/qbsinfopage.cpp b/src/plugins/qbsprojectmanager/qbsinfopage.cpp index 2432c48fe32..af65f9e5be6 100644 --- a/src/plugins/qbsprojectmanager/qbsinfopage.cpp +++ b/src/plugins/qbsprojectmanager/qbsinfopage.cpp @@ -54,7 +54,7 @@ QbsInfoPage::QbsInfoPage(QObject *parent) : Core::IOptionsPage(parent), m_widget setCategory(Constants::QBS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("QbsProjectManager", Constants::QBS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::QBS_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::QBS_SETTINGS_CATEGORY_ICON)); } QWidget *QbsInfoPage::widget() diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index 588a645272d..e576f52778f 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -80,7 +80,7 @@ QbsProfilesSettingsPage::QbsProfilesSettingsPage(QObject *parent) setCategory(Constants::QBS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("QbsProjectManager", Constants::QBS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::QBS_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::QBS_SETTINGS_CATEGORY_ICON)); } QWidget *QbsProfilesSettingsPage::widget() diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index 3e236631e13..bfe5884806c 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -199,7 +199,7 @@ SettingsPage::SettingsPage() : setCategory(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML); setDisplayCategory(QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML)); - setCategoryIcon(QLatin1String(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON)); + setCategoryIcon(Utils::Icon(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON)); } QWidget *SettingsPage::widget() diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp index 910521ca2c5..c98124499e5 100644 --- a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp +++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp @@ -108,7 +108,7 @@ QuickToolBarSettingsPage::QuickToolBarSettingsPage() : setCategory(Constants::SETTINGS_CATEGORY_QML); setDisplayCategory(QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML)); - setCategoryIcon(QLatin1String(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON)); + setCategoryIcon(Utils::Icon(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON)); } QWidget *QuickToolBarSettingsPage::widget() diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index a41d6854510..7b5f3250426 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -146,7 +146,7 @@ QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage(/*QSharedPointer<CppFileS setDisplayName(QCoreApplication::translate("QmlJSTools", Constants::QML_JS_CODE_STYLE_SETTINGS_NAME)); setCategory(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML); setDisplayCategory(QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML)); - setCategoryIcon(QLatin1String(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON)); + setCategoryIcon(Utils::Icon(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON)); } QWidget *QmlJSCodeStyleSettingsPage::widget() diff --git a/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp b/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp index eb7f8db880a..0d638740379 100644 --- a/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp +++ b/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp @@ -37,7 +37,7 @@ QmlProfilerOptionsPage::QmlProfilerOptionsPage() setDisplayName(tr("QML Profiler")); setCategory("T.Analyzer"); setDisplayCategory(tr("Analyzer")); - setCategoryIcon(QLatin1String(":/images/analyzer_category.png")); + setCategoryIcon(Utils::Icon(":/images/analyzer_category.png")); } QWidget *QmlProfilerOptionsPage::widget() diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp index 2f2b0b27f51..5644fb64c05 100644 --- a/src/plugins/qnx/qnxsettingspage.cpp +++ b/src/plugins/qnx/qnxsettingspage.cpp @@ -46,7 +46,7 @@ QnxSettingsPage::QnxSettingsPage(QObject* parent) : setCategory(Constants::QNX_CATEGORY); setDisplayCategory(QCoreApplication::translate("QNX", Constants::QNX_CATEGORY_TR)); - setCategoryIcon(QLatin1String(Constants::QNX_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::QNX_CATEGORY_ICON)); } QWidget* QnxSettingsPage::widget() diff --git a/src/plugins/qtsupport/codegensettingspage.cpp b/src/plugins/qtsupport/codegensettingspage.cpp index 57d8bd0eff5..66038ca186d 100644 --- a/src/plugins/qtsupport/codegensettingspage.cpp +++ b/src/plugins/qtsupport/codegensettingspage.cpp @@ -98,7 +98,7 @@ CodeGenSettingsPage::CodeGenSettingsPage(QObject *parent) : setDisplayName(QCoreApplication::translate("QtSupport", Constants::CODEGEN_SETTINGS_PAGE_NAME)); setCategory(CppTools::Constants::CPP_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CppTools", CppTools::Constants::CPP_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(CppTools::Constants::SETTINGS_CATEGORY_CPP_ICON)); + setCategoryIcon(Utils::Icon(CppTools::Constants::SETTINGS_CATEGORY_CPP_ICON)); } QWidget *CodeGenSettingsPage::widget() diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index ab9dc1c6f87..9667a5aa89e 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -168,7 +168,7 @@ QtOptionsPage::QtOptionsPage() setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); } QWidget *QtOptionsPage::widget() diff --git a/src/plugins/texteditor/texteditoroptionspage.cpp b/src/plugins/texteditor/texteditoroptionspage.cpp index a3fdc62c263..2e1d9b33219 100644 --- a/src/plugins/texteditor/texteditoroptionspage.cpp +++ b/src/plugins/texteditor/texteditoroptionspage.cpp @@ -36,5 +36,5 @@ TextEditorOptionsPage::TextEditorOptionsPage(QObject *parent) : { setCategory(Constants::TEXT_EDITOR_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("TextEditor", Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON)); + setCategoryIcon(Utils::Icon(Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON)); } diff --git a/src/plugins/todo/optionspage.cpp b/src/plugins/todo/optionspage.cpp index 100dceea527..5c2c7d084db 100644 --- a/src/plugins/todo/optionspage.cpp +++ b/src/plugins/todo/optionspage.cpp @@ -49,7 +49,7 @@ OptionsPage::OptionsPage(const Settings &settings, QObject *parent) : setDisplayName(tr("To-Do")); setCategory("To-Do"); setDisplayCategory(tr("To-Do")); - setCategoryIcon(QLatin1String(Constants::ICON_TODO)); + setCategoryIcon(Utils::Icon(Constants::ICON_TODO)); } void OptionsPage::setSettings(const Settings &settings) diff --git a/src/plugins/updateinfo/settingspage.cpp b/src/plugins/updateinfo/settingspage.cpp index 23a77fcd054..e8e07a7d9d7 100644 --- a/src/plugins/updateinfo/settingspage.cpp +++ b/src/plugins/updateinfo/settingspage.cpp @@ -47,7 +47,7 @@ SettingsPage::SettingsPage(UpdateInfoPlugin *plugin) { setId(FILTER_OPTIONS_PAGE_ID); setCategory(Core::Constants::SETTINGS_CATEGORY_CORE); - setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON)); + setCategoryIcon(Utils::Icon(Core::Constants::SETTINGS_CATEGORY_CORE_ICON)); setDisplayName(QCoreApplication::translate("Update", FILTER_OPTIONS_PAGE)); setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE)); } diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp index da2d9a191ba..4ae0a361c85 100644 --- a/src/plugins/valgrind/valgrindplugin.cpp +++ b/src/plugins/valgrind/valgrindplugin.cpp @@ -59,7 +59,7 @@ public: setDisplayName(QCoreApplication::translate("Valgrind::Internal::ValgrindOptionsPage", "Valgrind")); setCategory("T.Analyzer"); setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); - setCategoryIcon(QLatin1String(":/images/analyzer_category.png")); + setCategoryIcon(Utils::Icon(":/images/analyzer_category.png")); } QWidget *widget() diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.cpp b/src/plugins/vcsbase/vcsbaseoptionspage.cpp index a4bba72571c..8a7b038a6be 100644 --- a/src/plugins/vcsbase/vcsbaseoptionspage.cpp +++ b/src/plugins/vcsbase/vcsbaseoptionspage.cpp @@ -48,7 +48,7 @@ VcsBaseOptionsPage::VcsBaseOptionsPage(QObject *parent) : Core::IOptionsPage(par { setCategory(Constants::VCS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("VcsBase", Constants::VCS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_VCS_ICON)); + setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_VCS_ICON)); } VcsBaseOptionsPage::~VcsBaseOptionsPage() = default; |