Commit be48a3fa authored by hjk's avatar hjk Committed by Christian Kandeler

Use Core::Id for IOptionsPage::m_id

Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
parent 5e7cf3f0
......@@ -36,6 +36,7 @@
#include "analyzerbase_global.h"
#include <coreplugin/id.h>
#include <projectexplorer/runconfiguration.h>
namespace Analyzer {
......@@ -73,7 +74,7 @@ public:
virtual void fromMap(const QVariantMap &map) = 0;
/// unique ID for this configuration
virtual QString id() const = 0;
virtual Core::Id id() const = 0;
/// user readable display name for this configuration
virtual QString displayName() const = 0;
/// create a configuration widget for this configuration
......
......@@ -40,7 +40,7 @@ namespace Internal {
AndroidSettingsPage::AndroidSettingsPage(QObject *parent)
: Core::IOptionsPage(parent)
{
setId(QLatin1String(Constants::ANDROID_SETTINGS_ID));
setId(Constants::ANDROID_SETTINGS_ID);
setDisplayName(tr("Android Configurations"));
setCategory(Constants::ANDROID_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Android",
......
......@@ -91,7 +91,7 @@ QString OptionsPageWidget::searchKeywords() const
OptionsPage::OptionsPage()
{
setId(QLatin1String(VcsBase::Constants::VCS_ID_BAZAAR));
setId(VcsBase::Constants::VCS_ID_BAZAAR);
setDisplayName(tr("Bazaar"));
}
......
......@@ -127,7 +127,7 @@ QString SettingsPageWidget::searchKeywords() const
SettingsPage::SettingsPage() :
m_widget(0)
{
setId(QLatin1String(ClearCase::Constants::VCS_ID_CLEARCASE));
setId(ClearCase::Constants::VCS_ID_CLEARCASE);
setDisplayName(tr("ClearCase"));
}
......
......@@ -243,7 +243,7 @@ QString CMakeManager::qtVersionForQMake(const QString &qmakePath)
CMakeSettingsPage::CMakeSettingsPage()
: m_pathchooser(0)
{
setId(QLatin1String("Z.CMake"));
setId("Z.CMake");
setDisplayName(tr("CMake"));
setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
......
......@@ -44,9 +44,9 @@ class CORE_EXPORT IOptionsPage : public QObject
public:
IOptionsPage(QObject *parent = 0) : QObject(parent) {}
QString id() const { return m_id; }
Id id() const { return m_id; }
QString displayName() const { return m_displayName; }
Core::Id category() const { return m_category; }
Id category() const { return m_category; }
QString displayCategory() const { return m_displayCategory; }
QIcon categoryIcon() const { return QIcon(m_categoryIcon); }
......@@ -56,15 +56,15 @@ public:
virtual void finish() = 0;
protected:
void setId(const QString &id) { m_id = id; }
void setId(Id id) { m_id = id; }
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; }
QString m_id;
Id m_id;
QString m_displayName;
Core::Id m_category;
Id m_category;
QString m_displayCategory;
QString m_categoryIcon;
};
......
......@@ -272,7 +272,7 @@ bool optionsPageLessThan(const IOptionsPage *p1, const IOptionsPage *p2)
{
if (const int cc = p1->category().toString().compare(p2->category().toString()))
return cc < 0;
return p1->id().compare(p2->id()) < 0;
return p1->id().toString().compare(p2->id().toString()) < 0;
}
static inline QList<Core::IOptionsPage*> sortedOptionsPages()
......@@ -331,11 +331,11 @@ void SettingsDialog::showPage(Id categoryId, Id pageId)
{
// handle the case of "show last page"
Id initialCategory = categoryId;
QString initialPage = pageId.toString();
if (!initialCategory.isValid() && initialPage.isEmpty()) {
Id initialPage = pageId;
if (!initialCategory.isValid() && !initialPage.isValid()) {
QSettings *settings = ICore::settings();
initialCategory = Id::fromSetting(settings->value(QLatin1String(categoryKeyC)));
initialPage = settings->value(QLatin1String(pageKeyC), QVariant(QString())).toString();
initialPage = Id::fromSetting(settings->value(QLatin1String(pageKeyC)));
}
int initialCategoryIndex = -1;
......@@ -542,8 +542,8 @@ void SettingsDialog::apply()
void SettingsDialog::done(int val)
{
QSettings *settings = ICore::settings();
settings->setValue(QLatin1String(categoryKeyC), m_currentCategory.toString());
settings->setValue(QLatin1String(pageKeyC), m_currentPage);
settings->setValue(QLatin1String(categoryKeyC), m_currentCategory.toSetting());
settings->setValue(QLatin1String(pageKeyC), m_currentPage.toSetting());
ICore::saveSettings(); // save all settings
......
......@@ -93,13 +93,13 @@ private:
void ensureCategoryWidget(Category *category);
void disconnectTabWidgets();
const QList<Core::IOptionsPage*> m_pages;
const QList<IOptionsPage *> m_pages;
QSet<Core::IOptionsPage*> m_visitedPages;
QSet<IOptionsPage *> m_visitedPages;
QSortFilterProxyModel *m_proxyModel;
CategoryModel *m_model;
Core::Id m_currentCategory;
QString m_currentPage;
Id m_currentCategory;
Id m_currentPage;
QStackedLayout *m_stackedLayout;
Utils::FilterLineEdit *m_filterLineEdit;
QListView *m_categoryList;
......
......@@ -60,7 +60,7 @@ ShortcutSettings::ShortcutSettings(QObject *parent)
{
connect(ActionManager::instance(), SIGNAL(commandListChanged()), this, SLOT(initialize()));
setId(QLatin1String(Core::Constants::SETTINGS_ID_SHORTCUTS));
setId(Core::Constants::SETTINGS_ID_SHORTCUTS);
setDisplayName(tr("Keyboard"));
setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
......
......@@ -55,7 +55,7 @@ using namespace Core::Internal;
GeneralSettings::GeneralSettings():
m_page(0), m_dialog(0)
{
setId(QLatin1String(Core::Constants::SETTINGS_ID_ENVIRONMENT));
setId(Core::Constants::SETTINGS_ID_ENVIRONMENT);
setDisplayName(tr("General"));
setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
......
......@@ -547,7 +547,7 @@ void MimeTypeSettingsPrivate::resetMimeTypes()
void MimeTypeSettingsPrivate::updateMagicHeaderButtons()
{
const QModelIndex &modelIndex = m_ui.magicHeadersTableWidget->selectionModel()->currentIndex();
const bool enabled(modelIndex.isValid());
const bool enabled = modelIndex.isValid();
m_ui.removeMagicButton->setEnabled(enabled);
m_ui.editMagicButton->setEnabled(enabled);
......@@ -558,7 +558,7 @@ MimeTypeSettings::MimeTypeSettings(QObject *parent)
: IOptionsPage(parent)
, d(new MimeTypeSettingsPrivate)
{
setId(QLatin1String(Core::Constants::SETTINGS_ID_MIMETYPES));
setId(Core::Constants::SETTINGS_ID_MIMETYPES);
setDisplayName(tr("MIME Types"));
setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core",
......
......@@ -50,7 +50,7 @@ using namespace Core::Internal;
ToolSettings::ToolSettings(QObject *parent) :
IOptionsPage(parent)
{
setId(QLatin1String(Core::Constants::SETTINGS_ID_TOOLS));
setId(Core::Constants::SETTINGS_ID_TOOLS);
setDisplayName(tr("External Tools"));
setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
......
......@@ -51,7 +51,7 @@ namespace CodePaster {
CodePasterSettingsPage::CodePasterSettingsPage()
{
setId(QLatin1String("C.CodePaster"));
setId("C.CodePaster");
setDisplayName(tr("CodePaster"));
setCategory(Constants::CPASTER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CodePaster",
......
......@@ -98,7 +98,7 @@ FileShareProtocolSettingsPage::FileShareProtocolSettingsPage(const QSharedPointe
QObject *parent) :
Core::IOptionsPage(parent), m_settings(s), m_widget(0)
{
setId(QLatin1String("X.FileSharePaster"));
setId("X.FileSharePaster");
setDisplayName(tr("Fileshare"));
setCategory(Constants::CPASTER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CodePaster", Constants::CPASTER_SETTINGS_TR_CATEGORY));
......
......@@ -168,9 +168,8 @@ bool Protocol::showConfigurationError(const Protocol *p,
mb.exec();
bool rc = false;
if (mb.clickedButton() == settingsButton)
rc = Core::ICore::showOptionsDialog(Core::Id(p->settingsPage()->category()),
Core::Id::fromString(p->settingsPage()->id()),
parent);
rc = Core::ICore::showOptionsDialog(p->settingsPage()->category(),
p->settingsPage()->id(), parent);
return rc;
}
......
......@@ -78,7 +78,7 @@ Settings SettingsWidget::settings()
SettingsPage::SettingsPage(const QSharedPointer<Settings> &settings) :
m_settings(settings), m_widget(0)
{
setId(QLatin1String("A.General"));
setId("A.General");
setDisplayName(tr("General"));
setCategory(Constants::CPASTER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CodePaster",
......
......@@ -48,7 +48,7 @@ CompletionSettingsPage::CompletionSettingsPage(QObject *parent)
{
m_commentsSettings.fromSettings(QLatin1String(CPPTOOLS_SETTINGSGROUP), Core::ICore::settings());
setId(QLatin1String("P.Completion"));
setId("P.Completion");
setDisplayName(tr("Completion"));
}
......
......@@ -479,7 +479,7 @@ CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) :
Core::IOptionsPage(parent),
m_pageCppCodeStylePreferences(0)
{
setId(QLatin1String(Constants::CPP_CODE_STYLE_SETTINGS_ID));
setId(Constants::CPP_CODE_STYLE_SETTINGS_ID);
setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME));
setCategory(Constants::CPP_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
......
......@@ -319,7 +319,7 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin
Core::IOptionsPage(parent),
m_settings(settings)
{
setId(QLatin1String(Constants::CPP_FILE_SETTINGS_ID));
setId(Constants::CPP_FILE_SETTINGS_ID);
setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME));
setCategory(Constants::CPP_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
......
......@@ -94,7 +94,7 @@ QString SettingsPageWidget::searchKeywords() const
SettingsPage::SettingsPage()
{
setId(QLatin1String(VcsBase::Constants::VCS_ID_CVS));
setId(VcsBase::Constants::VCS_ID_CVS);
setDisplayName(tr("CVS"));
}
......
......@@ -322,7 +322,7 @@ CdbOptionsPage::CdbOptionsPage() :
CdbOptionsPage::m_instance = this;
m_options->fromSettings(Core::ICore::settings());
setId(CdbOptionsPage::settingsId());
setId("F.Cda");
setDisplayName(tr("CDB"));
setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger",
......@@ -330,11 +330,6 @@ CdbOptionsPage::CdbOptionsPage() :
setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
}
QString CdbOptionsPage::settingsId()
{
return QLatin1String("F.Cda");
}
CdbOptionsPage::~CdbOptionsPage()
{
CdbOptionsPage::m_instance = 0;
......
......@@ -128,7 +128,6 @@ public:
virtual ~CdbOptionsPage();
static CdbOptionsPage *instance();
static QString settingsId();
// IOptionsPage
QWidget *createPage(QWidget *parent);
......
......@@ -236,7 +236,7 @@ void CommonOptionsPageWidget::setGlobalOptions(const GlobalDebuggerOptions &go)
CommonOptionsPage::CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions> &go) :
m_options(go)
{
setId(QLatin1String(DEBUGGER_COMMON_SETTINGS_ID));
setId(DEBUGGER_COMMON_SETTINGS_ID);
setDisplayName(QCoreApplication::translate("Debugger", "General"));
setCategory(DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY));
......@@ -309,7 +309,7 @@ QString CommonOptionsPage::msgSetBreakpointAtFunctionToolTip(const char *functio
LocalsAndExpressionsOptionsPage::LocalsAndExpressionsOptionsPage()
{
setId(QLatin1String("Z.LocalsAndExpressions"));
setId("Z.LocalsAndExpressions");
//: '&&' will appear as one (one is marking keyboard shortcut)
setDisplayName(QCoreApplication::translate("Debugger", "Locals && Expressions"));
setCategory(DEBUGGER_SETTINGS_CATEGORY);
......
......@@ -380,7 +380,7 @@ GdbOptionsPageWidget::GdbOptionsPageWidget(QWidget *parent)
GdbOptionsPage::GdbOptionsPage()
{
setId(QLatin1String("M.Gdb"));
setId("M.Gdb");
setDisplayName(tr("GDB"));
setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
......
......@@ -105,7 +105,7 @@ QString CppSettingsPageWidget::searchKeywords() const
CppSettingsPage::CppSettingsPage(QObject *parent) : Core::IOptionsPage(parent)
{
m_parameters.fromSettings(Core::ICore::settings());
setId(QLatin1String(Designer::Constants::SETTINGS_CPP_SETTINGS_ID));
setId(Designer::Constants::SETTINGS_CPP_SETTINGS_ID);
setDisplayName(QCoreApplication::translate("Designer", Designer::Constants::SETTINGS_CPP_SETTINGS_NAME));
setCategory(Designer::Constants::SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Designer", Designer::Constants::SETTINGS_TR_CATEGORY));
......
......@@ -46,7 +46,7 @@ using namespace Designer::Internal;
SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) :
m_designerPage(designerPage), m_initialized(false)
{
setId(m_designerPage->name());
setId(Core::Id::fromString(m_designerPage->name()));
setDisplayName(m_designerPage->name());
setCategory(Designer::Constants::SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Designer",
......
......@@ -238,7 +238,7 @@ class FakeVimOptionPage : public IOptionsPage
public:
FakeVimOptionPage()
{
setId(_(SETTINGS_ID));
setId(SETTINGS_ID);
setDisplayName(tr("General"));
setCategory(SETTINGS_CATEGORY);
setDisplayCategory(tr("FakeVim"));
......@@ -405,7 +405,7 @@ public:
FakeVimExCommandsPage(FakeVimPluginPrivate *q)
: m_q(q)
{
setId(_(SETTINGS_EX_CMDS_ID));
setId(SETTINGS_EX_CMDS_ID);
setDisplayName(tr("Ex Command Mapping"));
setCategory(SETTINGS_CATEGORY);
setDisplayCategory(tr("FakeVim"));
......@@ -627,7 +627,7 @@ public:
FakeVimUserCommandsPage(FakeVimPluginPrivate *q)
: m_q(q)
{
setId(_(SETTINGS_USER_CMDS_ID));
setId(SETTINGS_USER_CMDS_ID);
setDisplayName(tr("User Command Mapping"));
setCategory(SETTINGS_CATEGORY);
setDisplayCategory(tr("FakeVim"));
......
......@@ -47,7 +47,7 @@ GerritOptionsPage::GerritOptionsPage(const QSharedPointer<GerritParameters> &p,
: VcsBase::VcsBaseOptionsPage(parent)
, m_parameters(p)
{
setId(QLatin1String("Gerrit"));
setId("Gerrit");
setDisplayName(tr("Gerrit"));
}
......
......@@ -119,7 +119,7 @@ QString SettingsPageWidget::searchKeywords() const
SettingsPage::SettingsPage() :
m_widget(0)
{
setId(QLatin1String(VcsBase::Constants::VCS_ID_GIT));
setId(VcsBase::Constants::VCS_ID_GIT);
setDisplayName(tr("Git"));
}
......
......@@ -67,9 +67,6 @@ class SettingsPage : public VcsBase::VcsBaseOptionsPage
public:
SettingsPage();
QString id() const;
QString displayName() const;
QWidget *createPage(QWidget *parent);
void apply();
void finish() { }
......
......@@ -42,7 +42,7 @@ using namespace Help::Internal;
DocSettingsPage::DocSettingsPage()
{
setId(QLatin1String("B.Documentation"));
setId("B.Documentation");
setDisplayName(tr("Documentation"));
setCategory(Help::Constants::HELP_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
......
......@@ -43,7 +43,7 @@ using namespace Help::Internal;
FilterSettingsPage::FilterSettingsPage()
{
setId(QLatin1String("D.Filters"));
setId("D.Filters");
setDisplayName(tr("Filters"));
setCategory(Help::Constants::HELP_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
......
......@@ -63,7 +63,7 @@ GeneralSettingsPage::GeneralSettingsPage()
QWebSettings* webSettings = QWebSettings::globalSettings();
m_font.setPointSize(webSettings->fontSize(QWebSettings::DefaultFontSize));
#endif
setId(QLatin1String("A.General settings"));
setId("A.General settings");
setDisplayName(tr("General"));
setCategory(Help::Constants::HELP_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
......
......@@ -48,7 +48,7 @@ using namespace Locator::Internal;
SettingsPage::SettingsPage(LocatorPlugin *plugin)
: m_plugin(plugin), m_page(0)
{
setId(QLatin1String(Constants::FILTER_OPTIONS_PAGE));
setId(Constants::FILTER_OPTIONS_PAGE);
setDisplayName(QCoreApplication::translate("Locator", Locator::Constants::FILTER_OPTIONS_PAGE));
setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
......
......@@ -46,7 +46,7 @@ using namespace Macros::Internal;
MacroOptionsPage::MacroOptionsPage(QObject *parent)
: Core::IOptionsPage(parent)
{
setId(QLatin1String(Constants::M_OPTIONS_PAGE));
setId(Constants::M_OPTIONS_PAGE);
setDisplayName(QCoreApplication::translate("Macros", Constants::M_OPTIONS_TR_PAGE));
setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("TextEditor",
......
......@@ -92,7 +92,7 @@ private:
Q_SLOT void showSettingsPage()
{
Core::ICore::showOptionsDialog(MaemoQemuSettingsPage::pageCategory(),
Core::Id(MaemoQemuSettingsPage::pageId()));
MaemoQemuSettingsPage::pageId());
accept();
}
};
......@@ -136,9 +136,9 @@ void MaemoQemuSettingsPage::showQemuCrashDialog()
dlg.exec();
}
QString MaemoQemuSettingsPage::pageId()
Core::Id MaemoQemuSettingsPage::pageId()
{
return QLatin1String("ZZ.Qemu Settings");
return "ZZ.Qemu Settings";
}
Core::Id MaemoQemuSettingsPage::pageCategory()
......
......@@ -50,7 +50,7 @@ public:
void finish();
static void showQemuCrashDialog();
static QString pageId();
static Core::Id pageId();
static Core::Id pageCategory();
private:
......
......@@ -91,7 +91,7 @@ QString OptionsPageWidget::searchKeywords() const
OptionsPage::OptionsPage()
{
setId(QLatin1String(VcsBase::Constants::VCS_ID_MERCURIAL));
setId(VcsBase::Constants::VCS_ID_MERCURIAL);
setDisplayName(tr("Mercurial"));
}
......
......@@ -64,8 +64,6 @@ class OptionsPage : public VcsBase::VcsBaseOptionsPage
public:
OptionsPage();
QString id() const;
QString displayName() const;
QWidget *createPage(QWidget *parent);
void apply();
......
......@@ -138,7 +138,7 @@ QString SettingsPageWidget::searchKeywords() const
SettingsPage::SettingsPage()
{
setId(QLatin1String(VcsBase::Constants::VCS_ID_PERFORCE));
setId(VcsBase::Constants::VCS_ID_PERFORCE);
setDisplayName(tr("Perforce"));
}
......
......@@ -42,7 +42,7 @@ namespace Internal {
DeviceSettingsPage::DeviceSettingsPage(QObject *parent)
: Core::IOptionsPage(parent)
{
setId(QLatin1String(Constants::DEVICE_SETTINGS_PAGE_ID));
setId(Constants::DEVICE_SETTINGS_PAGE_ID);
setDisplayName(tr("Devices"));
setCategory(Constants::DEVICE_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Devices"));
......
......@@ -55,7 +55,7 @@ namespace ProjectExplorer {
KitOptionsPage::KitOptionsPage() :
m_model(0), m_selectionModel(0), m_currentWidget(0), m_toShow(0)
{
setId(QLatin1String(Constants::KITS_SETTINGS_PAGE_ID));
setId(Constants::KITS_SETTINGS_PAGE_ID);
setDisplayName(tr("Kits"));
setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
......
......@@ -175,7 +175,7 @@ QString ProjectExplorerSettingsWidget::searchKeywords() const
// ------------------ ProjectExplorerSettingsPage
ProjectExplorerSettingsPage::ProjectExplorerSettingsPage()
{
setId(QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_ID));
setId(Constants::PROJECTEXPLORER_SETTINGS_ID);
setDisplayName(tr("General"));
setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
......
......@@ -445,7 +445,7 @@ ToolChainOptionsPage::ToolChainOptionsPage() :
m_model(0), m_selectionModel(0), m_toolChainView(0), m_container(0),
m_addButton(0), m_cloneButton(0), m_delButton(0)
{
setId(QLatin1String(Constants::TOOLCHAIN_SETTINGS_PAGE_ID));
setId(Constants::TOOLCHAIN_SETTINGS_PAGE_ID);
setDisplayName(tr("Compilers"));
setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
......
......@@ -84,7 +84,7 @@ QString SettingsPageWidget::searchKeywords() const
SettingsPage::SettingsPage() :
m_widget(0)
{
setId(QLatin1String("B.QmlDesigner"));
setId("B.QmlDesigner");
setDisplayName(tr("Qt Quick Designer"));
setCategory(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
setDisplayCategory(QCoreApplication::translate("QmlJSEditor",
......
......@@ -121,7 +121,7 @@ QuickToolBarSettings QuickToolBarSettings::get()
QuickToolBarSettingsPage::QuickToolBarSettingsPage() :
m_widget(0)
{
setId(QLatin1String("C.QmlToolbar"));
setId("C.QmlToolbar");
setDisplayName(tr("Qt Quick ToolBar"));
setCategory(Constants::SETTINGS_CATEGORY_QML);
setDisplayCategory(QCoreApplication::translate("QmlJSEditor",
......
......@@ -166,7 +166,7 @@ QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage(/*QSharedPointer<CppFileS
Core::IOptionsPage(parent),
m_pageTabPreferences(0)
{
setId(QLatin1String(Constants::QML_JS_CODE_STYLE_SETTINGS_ID));
setId(Constants::QML_JS_CODE_STYLE_SETTINGS_ID);
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));
......
......@@ -43,7 +43,7 @@ namespace Internal {
BlackBerrySettingsPage::BlackBerrySettingsPage(QObject *parent) :
Core::IOptionsPage(parent)
{
setId(QLatin1String(Constants::QNX_SETTINGS_ID));
setId(Constants::QNX_SETTINGS_ID);
setDisplayName(tr("BlackBerry"));
setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("BlackBerry",
......
......@@ -71,7 +71,7 @@ using namespace Utils;
QtOptionsPage::QtOptionsPage()