Use Core::Id for IOptionPage::category

Change-Id: I63433edd9118a7aa4ecaef28f40bfc729d90f512
Reviewed-by: hjk <qthjk@ovi.com>

src/plugins/analyzerbase/analyzeroptionspage.cpp

@@ -48,7 +48,7 @@ AnalyzerOptionsPage::AnalyzerOptionsPage(AbstractAnalyzerSubConfig *config, QObj
 {
     setId(m_config->id());
     setDisplayName(m_config->displayName());
-    setCategory(QLatin1String("T.Analyzer"));
+    setCategory("T.Analyzer");
     setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer"));
     setCategoryIcon(QLatin1String(":/images/analyzer_category.png"));
 }

src/plugins/android/androidsettingspage.cpp

@@ -42,7 +42,7 @@ AndroidSettingsPage::AndroidSettingsPage(QObject *parent)
 {
     setId(QLatin1String(Constants::ANDROID_SETTINGS_ID));
     setDisplayName(tr("Android Configurations"));
-    setCategory(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY));
+    setCategory(Constants::ANDROID_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Android",
         Constants::ANDROID_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON));

src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

@@ -245,7 +245,7 @@ CMakeSettingsPage::CMakeSettingsPage()
 {
     setId(QLatin1String("Z.CMake"));
     setDisplayName(tr("CMake"));
-    setCategory(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY));
+    setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
        ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON));

src/plugins/coreplugin/dialogs/ioptionspage.h

@@ -30,7 +30,7 @@
 #ifndef IOPTIONSPAGE_H
 #define IOPTIONSPAGE_H
 
-#include <coreplugin/core_global.h>
+#include <coreplugin/id.h>
 
 #include <QIcon>
 #include <QObject>
@@ -46,7 +46,7 @@ public:
 
     QString id() const { return m_id; }
     QString displayName() const { return m_displayName; }
-    QString category() const { return m_category; }
+    Core::Id category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
     QIcon categoryIcon() const { return QIcon(m_categoryIcon); }
 
@@ -58,13 +58,13 @@ public:
 protected:
     void setId(const QString &id) { m_id = id; }
     void setDisplayName(const QString &displayName) { m_displayName = displayName; }
-    void setCategory(const QString &category) { m_category = category; }
+    void setCategory(Id category) { m_category = category; }
     void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
     void setCategoryIcon(const QString &categoryIcon) { m_categoryIcon = categoryIcon; }
 
     QString m_id;
     QString m_displayName;
-    QString m_category;
+    Core::Id m_category;
     QString m_displayCategory;
     QString m_categoryIcon;
 };
@@ -84,18 +84,18 @@ class CORE_EXPORT IOptionsPageProvider : public QObject
 public:
     IOptionsPageProvider(QObject *parent = 0) : QObject(parent) {}
 
-    QString category() const { return m_category; }
+    Core::Id category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
     QIcon categoryIcon() const { return QIcon(m_categoryIcon); }
 
     virtual QList<IOptionsPage *> pages() const = 0;
 
 protected:
-    void setCategory(const QString &category) { m_category = category; }
+    void setCategory(Core::Id category) { m_category = category; }
     void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
     void setCategoryIcon(const QString &categoryIcon) { m_categoryIcon = categoryIcon; }
 
-    QString m_category;
+    Core::Id m_category;
     QString m_displayCategory;
     QString m_categoryIcon;
 };

src/plugins/coreplugin/dialogs/settingsdialog.cpp

@@ -69,9 +69,10 @@ static QPointer<SettingsDialog> m_instance = 0;
 
 // ----------- Category model
 
-class Category {
+class Category
+{
 public:
-    QString id;
+    Id id;
     QString displayName;
     QIcon icon;
     QList<IOptionsPage *> pages;
@@ -94,7 +95,7 @@ public:
     const QList<Category*> &categories() const { return m_categories; }
 
 private:
-    Category *findCategoryById(const QString &id);
+    Category *findCategoryById(Id id);
 
     QList<Category*> m_categories;
     QIcon m_emptyIcon;
@@ -145,7 +146,7 @@ void CategoryModel::setPages(const QList<IOptionsPage*> &pages,
 
     // Put the pages in categories
     foreach (IOptionsPage *page, pages) {
-        const QString &categoryId = page->category();
+        const Id categoryId = page->category();
         Category *category = findCategoryById(categoryId);
         if (!category) {
             category = new Category;
@@ -162,7 +163,7 @@ void CategoryModel::setPages(const QList<IOptionsPage*> &pages,
     }
 
     foreach (IOptionsPageProvider *provider, providers) {
-        const QString &categoryId = provider->category();
+        const Id categoryId = provider->category();
         Category *category = findCategoryById(categoryId);
         if (!category) {
             category = new Category;
@@ -181,7 +182,7 @@ void CategoryModel::setPages(const QList<IOptionsPage*> &pages,
     endResetModel();
 }
 
-Category *CategoryModel::findCategoryById(const QString &id)
+Category *CategoryModel::findCategoryById(Id id)
 {
     for (int i = 0; i < m_categories.size(); ++i) {
         Category *category = m_categories.at(i);
@@ -269,7 +270,7 @@ public:
 // Helpers to sort by category. id
 bool optionsPageLessThan(const IOptionsPage *p1, const IOptionsPage *p2)
 {
-    if (const int cc = p1->category().compare(p2->category()))
+    if (const int cc = p1->category().toString().compare(p2->category().toString()))
         return cc < 0;
     return p1->id().compare(p2->id()) < 0;
 }
@@ -329,11 +330,11 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
 void SettingsDialog::showPage(Id categoryId, Id pageId)
 {
     // handle the case of "show last page"
-    QString initialCategory = categoryId.toString();
+    Id initialCategory = categoryId;
     QString initialPage = pageId.toString();
-    if (initialCategory.isEmpty() && initialPage.isEmpty()) {
+    if (!initialCategory.isValid() && initialPage.isEmpty()) {
         QSettings *settings = ICore::settings();
-        initialCategory = settings->value(QLatin1String(categoryKeyC), QVariant(QString())).toString();
+        initialCategory = Id(settings->value(QLatin1String(categoryKeyC), QVariant(QString())).toString());
         initialPage = settings->value(QLatin1String(pageKeyC), QVariant(QString())).toString();
     }
 
@@ -462,7 +463,7 @@ void SettingsDialog::updateEnabledTabs(Category *category, const QString &search
     for (int i = 0; i < category->pages.size(); ++i) {
         const IOptionsPage *page = category->pages.at(i);
         const bool enabled = searchText.isEmpty()
-                             || page->category().contains(searchText, Qt::CaseInsensitive)
+                             || page->category().toString().contains(searchText, Qt::CaseInsensitive)
                              || page->displayName().contains(searchText, Qt::CaseInsensitive)
                              || page->matches(searchText);
         category->tabWidget->setTabEnabled(i, enabled);
@@ -541,7 +542,7 @@ void SettingsDialog::apply()
 void SettingsDialog::done(int val)
 {
     QSettings *settings = ICore::settings();
-    settings->setValue(QLatin1String(categoryKeyC), m_currentCategory);
+    settings->setValue(QLatin1String(categoryKeyC), m_currentCategory.toString());
     settings->setValue(QLatin1String(pageKeyC), m_currentPage);
 
     ICore::saveSettings(); // save all settings

src/plugins/coreplugin/dialogs/settingsdialog.h

@@ -35,7 +35,6 @@
 
 #include <QList>
 #include <QSet>
-#include <QPointer>
 #include <QEventLoop>
 #include <QDialog>
 
@@ -99,7 +98,7 @@ private:
     QSet<Core::IOptionsPage*> m_visitedPages;
     QSortFilterProxyModel *m_proxyModel;
     CategoryModel *m_model;
-    QString m_currentCategory;
+    Core::Id m_currentCategory;
     QString m_currentPage;
     QStackedLayout *m_stackedLayout;
     Utils::FilterLineEdit *m_filterLineEdit;

src/plugins/coreplugin/dialogs/shortcutsettings.cpp

@@ -62,7 +62,7 @@ ShortcutSettings::ShortcutSettings(QObject *parent)
 
     setId(QLatin1String(Core::Constants::SETTINGS_ID_SHORTCUTS));
     setDisplayName(tr("Keyboard"));
-    setCategory(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE));
+    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
     setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
     setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
 }

src/plugins/coreplugin/generalsettings.cpp

@@ -56,7 +56,7 @@ GeneralSettings::GeneralSettings():
 {
     setId(QLatin1String(Core::Constants::SETTINGS_ID_ENVIRONMENT));
     setDisplayName(tr("General"));
-    setCategory(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE));
+    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
     setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
     setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
 }

src/plugins/coreplugin/mimetypesettings.cpp

@@ -560,7 +560,7 @@ MimeTypeSettings::MimeTypeSettings(QObject *parent)
 {
     setId(QLatin1String(Core::Constants::SETTINGS_ID_MIMETYPES));
     setDisplayName(tr("MIME Types"));
-    setCategory(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE));
+    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
     setDisplayCategory(QCoreApplication::translate("Core",
         Core::Constants::SETTINGS_TR_CATEGORY_CORE));
     setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));

src/plugins/coreplugin/toolsettings.cpp

@@ -52,7 +52,7 @@ ToolSettings::ToolSettings(QObject *parent) :
 {
     setId(QLatin1String(Core::Constants::SETTINGS_ID_TOOLS));
     setDisplayName(tr("External Tools"));
-    setCategory(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE));
+    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
     setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
     setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
 }

src/plugins/cpaster/codepastersettings.cpp

@@ -53,7 +53,7 @@ CodePasterSettingsPage::CodePasterSettingsPage()
 {
     setId(QLatin1String("C.CodePaster"));
     setDisplayName(tr("CodePaster"));
-    setCategory(QLatin1String(Constants::CPASTER_SETTINGS_CATEGORY));
+    setCategory(Constants::CPASTER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("CodePaster",
         Constants::CPASTER_SETTINGS_TR_CATEGORY));
 

src/plugins/cpaster/fileshareprotocolsettingspage.cpp

@@ -100,7 +100,7 @@ FileShareProtocolSettingsPage::FileShareProtocolSettingsPage(const QSharedPointe
 {
     setId(QLatin1String("X.FileSharePaster"));
     setDisplayName(tr("Fileshare"));
-    setCategory(QLatin1String(Constants::CPASTER_SETTINGS_CATEGORY));
+    setCategory(Constants::CPASTER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("CodePaster", Constants::CPASTER_SETTINGS_TR_CATEGORY));
 }
 

src/plugins/cpaster/settingspage.cpp

@@ -80,7 +80,7 @@ SettingsPage::SettingsPage(const QSharedPointer<Settings> &settings) :
 {
     setId(QLatin1String("A.General"));
     setDisplayName(tr("General"));
-    setCategory(QLatin1String(Constants::CPASTER_SETTINGS_CATEGORY));
+    setCategory(Constants::CPASTER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("CodePaster",
         Constants::CPASTER_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPASTER_ICON));

src/plugins/cpptools/cppcodestylesettingspage.cpp

@@ -481,7 +481,7 @@ CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) :
 {
     setId(QLatin1String(Constants::CPP_CODE_STYLE_SETTINGS_ID));
     setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME));
-    setCategory(QLatin1String(Constants::CPP_SETTINGS_CATEGORY));
+    setCategory(Constants::CPP_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
 }

src/plugins/cpptools/cppfilesettingspage.cpp

@@ -321,7 +321,7 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin
 {
     setId(QLatin1String(Constants::CPP_FILE_SETTINGS_ID));
     setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME));
-    setCategory(QLatin1String(Constants::CPP_SETTINGS_CATEGORY));
+    setCategory(Constants::CPP_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
 }

src/plugins/debugger/cdb/cdboptionspage.cpp

@@ -323,9 +323,8 @@ CdbOptionsPage::CdbOptionsPage() :
     m_options->fromSettings(Core::ICore::settings());
 
     setId(CdbOptionsPage::settingsId());
-
     setDisplayName(tr("CDB"));
-    setCategory(QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY));
+    setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Debugger",
         Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));

src/plugins/debugger/commonoptionspage.cpp

@@ -238,7 +238,7 @@ CommonOptionsPage::CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions>
 {
     setId(QLatin1String(DEBUGGER_COMMON_SETTINGS_ID));
     setDisplayName(QCoreApplication::translate("Debugger", "General"));
-    setCategory(QLatin1String(DEBUGGER_SETTINGS_CATEGORY));
+    setCategory(DEBUGGER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
 }
@@ -312,7 +312,7 @@ LocalsAndExpressionsOptionsPage::LocalsAndExpressionsOptionsPage()
     setId(QLatin1String("Z.LocalsAndExpressions"));
     //: '&&' will appear as one (one is marking keyboard shortcut)
     setDisplayName(QCoreApplication::translate("Debugger", "Locals && Expressions"));
-    setCategory(QLatin1String(DEBUGGER_SETTINGS_CATEGORY));
+    setCategory(DEBUGGER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
 }

src/plugins/debugger/gdb/gdboptionspage.cpp

@@ -382,7 +382,7 @@ GdbOptionsPage::GdbOptionsPage()
 {
     setId(QLatin1String("M.Gdb"));
     setDisplayName(tr("GDB"));
-    setCategory(QLatin1String(Constants::DEBUGGER_SETTINGS_CATEGORY));
+    setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
 }

src/plugins/debugger/lldb/lldboptionspage.cpp

@@ -72,7 +72,7 @@ LldbOptionsPage::LldbOptionsPage()
     //    m_options->fromSettings(Core::ICore::settings());
     setId(QLatin1String("F.Lldb"));
     setDisplayName(tr("LLDB"));
-    setCategory(QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY));
+    setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)));
 }

src/plugins/designer/cpp/cppsettingspage.cpp

@@ -107,7 +107,7 @@ CppSettingsPage::CppSettingsPage(QObject *parent) : Core::IOptionsPage(parent)
     m_parameters.fromSettings(Core::ICore::settings());
     setId(QLatin1String(Designer::Constants::SETTINGS_CPP_SETTINGS_ID));
     setDisplayName(QCoreApplication::translate("Designer", Designer::Constants::SETTINGS_CPP_SETTINGS_NAME));
-    setCategory(QLatin1String(Designer::Constants::SETTINGS_CATEGORY));
+    setCategory(Designer::Constants::SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Designer", Designer::Constants::SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(Designer::Constants::SETTINGS_CATEGORY_ICON));
 }