feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use Core::Id for IOptionsPage::m_id

Browse Source 
Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
hjk
2013-01-16 15:22:58 +01:00
committed by Christian Kandeler
parent 5e7cf3f062
commit be48a3faff
63 changed files with 95 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/analyzerbase/analyzersettings.h
View File

@@ -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

2
src/plugins/android/androidsettingspage.cpp
View File

@@ -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",

2
src/plugins/bazaar/optionspage.cpp
View File

@@ -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"));
}

2
src/plugins/clearcase/settingspage.cpp
View File

@@ -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"));
}

2
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -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",

10
src/plugins/coreplugin/dialogs/ioptionspage.h
View File

@@ -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;
};

12
src/plugins/coreplugin/dialogs/settingsdialog.cpp
View File

@@ -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

8
src/plugins/coreplugin/dialogs/settingsdialog.h
View File

@@ -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;

2
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

@@ -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));

2
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -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));

4
src/plugins/coreplugin/mimetypesettings.cpp
View File

@@ -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",

2
src/plugins/coreplugin/toolsettings.cpp
View File

@@ -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));

2
src/plugins/cpaster/codepastersettings.cpp
View File

@@ -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",

2
src/plugins/cpaster/fileshareprotocolsettingspage.cpp
View File

@@ -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));

5
src/plugins/cpaster/protocol.cpp
View File

@@ -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;
}

2
src/plugins/cpaster/settingspage.cpp
View File

@@ -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",

2
src/plugins/cpptools/completionsettingspage.cpp
View File

@@ -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"));
}

2
src/plugins/cpptools/cppcodestylesettingspage.cpp
View File

@@ -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));

2
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -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));

2
src/plugins/cvs/settingspage.cpp
View File

@@ -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"));
}

7
src/plugins/debugger/cdb/cdboptionspage.cpp
View File

@@ -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;

1
src/plugins/debugger/cdb/cdboptionspage.h
View File

@@ -128,7 +128,6 @@ public:
virtual ~CdbOptionsPage();
static CdbOptionsPage *instance();
static QString settingsId();
// IOptionsPage
QWidget *createPage(QWidget *parent);

4
src/plugins/debugger/commonoptionspage.cpp
View File

@@ -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);

2
src/plugins/debugger/gdb/gdboptionspage.cpp
View File

@@ -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));

2
src/plugins/designer/cpp/cppsettingspage.cpp
View File

@@ -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));

2
src/plugins/designer/settingspage.cpp
View File

@@ -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",

6
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -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"));

2
src/plugins/git/gerrit/gerritoptionspage.cpp
View File

@@ -47,7 +47,7 @@ GerritOptionsPage::GerritOptionsPage(const QSharedPointer<GerritParameters> &p,
: VcsBase::VcsBaseOptionsPage(parent)
, m_parameters(p)
{
setId(QLatin1String("Gerrit"));
setId("Gerrit");
setDisplayName(tr("Gerrit"));
}

2
src/plugins/git/settingspage.cpp
View File

@@ -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"));
}

3
src/plugins/git/settingspage.h
View File

@@ -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() { }

2
src/plugins/help/docsettingspage.cpp
View File

@@ -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));

2
src/plugins/help/filtersettingspage.cpp
View File

@@ -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));

2
src/plugins/help/generalsettingspage.cpp
View File

@@ -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));

2
src/plugins/locator/settingspage.cpp
View File

@@ -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));

2
src/plugins/macros/macrooptionspage.cpp
View File

@@ -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",

6
src/plugins/madde/maemosettingspages.cpp
View File

@@ -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()

2
src/plugins/madde/maemosettingspages.h
View File

@@ -50,7 +50,7 @@ public:
void finish();
static void showQemuCrashDialog();
static QString pageId();
static Core::Id pageId();
static Core::Id pageCategory();
private:

2
src/plugins/mercurial/optionspage.cpp
View File

@@ -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"));
}

2
src/plugins/mercurial/optionspage.h
View File

@@ -64,8 +64,6 @@ class OptionsPage : public VcsBase::VcsBaseOptionsPage
public:
OptionsPage();
QString id() const;
QString displayName() const;
QWidget *createPage(QWidget *parent);
void apply();

2
src/plugins/perforce/settingspage.cpp
View File

@@ -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"));
}

2
src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
View File

@@ -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"));

2
src/plugins/projectexplorer/kitoptionspage.cpp
View File

@@ -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",

2
src/plugins/projectexplorer/projectexplorersettingspage.cpp
View File

@@ -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",

2
src/plugins/projectexplorer/toolchainoptionspage.cpp
View File

@@ -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",

2
src/plugins/qmldesigner/settingspage.cpp
View File

@@ -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",

2
src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
View File

@@ -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",

2
src/plugins/qmljstools/qmljscodestylesettingspage.cpp
View File

@@ -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));

2
src/plugins/qnx/blackberrysettingspage.cpp
View File

@@ -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",

2
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -71,7 +71,7 @@ using namespace Utils;
QtOptionsPage::QtOptionsPage()
: m_widget(0)
{
setId(QLatin1String(Constants::QTVERSION_SETTINGS_PAGE_ID));
setId(Constants::QTVERSION_SETTINGS_PAGE_ID);
setDisplayName(QCoreApplication::translate("Qt4ProjectManager", Constants::QTVERSION_SETTINGS_PAGE_NAME));
setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer",

2
src/plugins/subversion/settingspage.cpp
View File

@@ -103,7 +103,7 @@ QString SettingsPageWidget::searchKeywords() const
SettingsPage::SettingsPage() :
m_widget(0)
{
setId(QLatin1String(VcsBase::Constants::VCS_ID_SUBVERSION));
setId(VcsBase::Constants::VCS_ID_SUBVERSION);
setDisplayName(tr("Subversion"));
}

2
src/plugins/texteditor/behaviorsettingspage.h
View File

@@ -47,7 +47,7 @@ class CodeStylePool;
class BehaviorSettingsPageParameters
{
public:
QString id;
Core::Id id;
QString displayName;
QString settingsPrefix;
};

2
src/plugins/texteditor/displaysettingspage.h
View File

@@ -41,7 +41,7 @@ class DisplaySettings;
class DisplaySettingsPageParameters
{
public:
QString id;
Core::Id id;
QString displayName;
QString settingsPrefix;
};

8
src/plugins/texteditor/fontsettingspage.cpp
View File

@@ -117,13 +117,13 @@ class FontSettingsPagePrivate
{
public:
FontSettingsPagePrivate(const TextEditor::FormatDescriptions &fd,
const QString &id,
Core::Id id,
const QString &displayName,
const QString &category);
~FontSettingsPagePrivate();
public:
const QString m_id;
const Core::Id m_id;
const QString m_displayName;
const QString m_settingsGroup;
@@ -174,7 +174,7 @@ static QString createColorSchemeFileName(const QString &pattern)
// ------- FontSettingsPagePrivate
FontSettingsPagePrivate::FontSettingsPagePrivate(const TextEditor::FormatDescriptions &fd,
const QString &id,
Core::Id id,
const QString &displayName,
const QString &category) :
m_id(id),
@@ -313,7 +313,7 @@ QColor FormatDescription::background() const
// ------------ FontSettingsPage
FontSettingsPage::FontSettingsPage(const FormatDescriptions &fd,
const QString &id,
Core::Id id,
QObject *parent) :
TextEditorOptionsPage(parent),
d_ptr(new FontSettingsPagePrivate(fd, id, tr("Font && Colors"), category().toString()))

4
src/plugins/texteditor/fontsettingspage.h
View File

@@ -88,9 +88,7 @@ class TEXTEDITOR_EXPORT FontSettingsPage : public TextEditorOptionsPage
Q_OBJECT
public:
FontSettingsPage(const FormatDescriptions &fd,
const QString &id,
QObject *parent = 0);
FontSettingsPage(const FormatDescriptions &fd, Core::Id id, QObject *parent = 0);
~FontSettingsPage();

8
src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp
View File

@@ -43,11 +43,11 @@ using namespace Internal;
struct HighlighterSettingsPage::HighlighterSettingsPagePrivate
{
explicit HighlighterSettingsPagePrivate(const QString &id);
explicit HighlighterSettingsPagePrivate(Core::Id id);
void ensureInitialized();
bool m_initialized;
const QString m_id;
const Core::Id m_id;
const QString m_displayName;
const QString m_settingsPrefix;
@@ -59,7 +59,7 @@ struct HighlighterSettingsPage::HighlighterSettingsPagePrivate
};
HighlighterSettingsPage::HighlighterSettingsPagePrivate::
HighlighterSettingsPagePrivate(const QString &id) :
HighlighterSettingsPagePrivate(Core::Id id) :
m_initialized(false),
m_id(id),
m_displayName(tr("Generic Highlighter")),
@@ -75,7 +75,7 @@ void HighlighterSettingsPage::HighlighterSettingsPagePrivate::ensureInitialized(
m_settings.fromSettings(m_settingsPrefix, Core::ICore::settings());
}
HighlighterSettingsPage::HighlighterSettingsPage(const QString &id, QObject *parent) :
HighlighterSettingsPage::HighlighterSettingsPage(Core::Id id, QObject *parent) :
TextEditorOptionsPage(parent),
m_requestMimeTypeRegistration(false),
m_d(new HighlighterSettingsPagePrivate(id))

2
src/plugins/texteditor/generichighlighter/highlightersettingspage.h
View File

@@ -49,7 +49,7 @@ class HighlighterSettingsPage : public TextEditorOptionsPage
Q_OBJECT
public:
HighlighterSettingsPage(const QString &id, QObject *parent);
HighlighterSettingsPage(Core::Id id, QObject *parent);
~HighlighterSettingsPage();
QWidget *createPage(QWidget *parent);

10
src/plugins/texteditor/snippets/snippetssettingspage.cpp
View File

@@ -268,10 +268,10 @@ class SnippetsSettingsPagePrivate : public QObject
{
Q_OBJECT
public:
SnippetsSettingsPagePrivate(const QString &id);
SnippetsSettingsPagePrivate(Core::Id id);
~SnippetsSettingsPagePrivate() { delete m_model; }
const QString &id() const { return m_id; }
Core::Id id() const { return m_id; }
const QString &displayName() const { return m_displayName; }
bool isKeyword(const QString &s) const { return m_keywords.contains(s, Qt::CaseInsensitive); }
void configureUi(QWidget *parent);
@@ -301,7 +301,7 @@ private:
bool settingsChanged() const;
void writeSettings();
const QString m_id;
const Core::Id m_id;
const QString m_displayName;
const QString m_settingsPrefix;
SnippetsTableModel *m_model;
@@ -311,7 +311,7 @@ private:
Ui::SnippetsSettingsPage m_ui;
};
SnippetsSettingsPagePrivate::SnippetsSettingsPagePrivate(const QString &id) :
SnippetsSettingsPagePrivate::SnippetsSettingsPagePrivate(Core::Id id) :
m_id(id),
m_displayName(tr("Snippets")),
m_settingsPrefix(QLatin1String("Text")),
@@ -557,7 +557,7 @@ void SnippetsSettingsPagePrivate::decorateEditors(const TextEditor::FontSettings
}
// SnippetsSettingsPage
SnippetsSettingsPage::SnippetsSettingsPage(const QString &id, QObject *parent) :
SnippetsSettingsPage::SnippetsSettingsPage(Core::Id id, QObject *parent) :
TextEditorOptionsPage(parent),
d(new SnippetsSettingsPagePrivate(id))
{

2
src/plugins/texteditor/snippets/snippetssettingspage.h
View File

@@ -42,7 +42,7 @@ class SnippetsSettingsPage : public TextEditorOptionsPage
Q_OBJECT
public:
SnippetsSettingsPage(const QString &id, QObject *parent);
SnippetsSettingsPage(Core::Id id, QObject *parent);
~SnippetsSettingsPage();
bool matches(const QString &s) const;

10
src/plugins/texteditor/texteditorsettings.cpp
View File

@@ -256,31 +256,31 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
"(in diff editor)."), Qt::blue));
m_d->m_fontSettingsPage = new FontSettingsPage(formatDescr,
QLatin1String(Constants::TEXT_EDITOR_FONT_SETTINGS),
Constants::TEXT_EDITOR_FONT_SETTINGS,
this);
ExtensionSystem::PluginManager::addObject(m_d->m_fontSettingsPage);
// Add the GUI used to configure the tab, storage and interaction settings
TextEditor::BehaviorSettingsPageParameters behaviorSettingsPageParameters;
behaviorSettingsPageParameters.id = QLatin1String(Constants::TEXT_EDITOR_BEHAVIOR_SETTINGS);
behaviorSettingsPageParameters.id = Constants::TEXT_EDITOR_BEHAVIOR_SETTINGS;
behaviorSettingsPageParameters.displayName = tr("Behavior");
behaviorSettingsPageParameters.settingsPrefix = QLatin1String("text");
m_d->m_behaviorSettingsPage = new BehaviorSettingsPage(behaviorSettingsPageParameters, this);
ExtensionSystem::PluginManager::addObject(m_d->m_behaviorSettingsPage);
TextEditor::DisplaySettingsPageParameters displaySettingsPageParameters;
displaySettingsPageParameters.id = QLatin1String(Constants::TEXT_EDITOR_DISPLAY_SETTINGS),
displaySettingsPageParameters.id = Constants::TEXT_EDITOR_DISPLAY_SETTINGS;
displaySettingsPageParameters.displayName = tr("Display");
displaySettingsPageParameters.settingsPrefix = QLatin1String("text");
m_d->m_displaySettingsPage = new DisplaySettingsPage(displaySettingsPageParameters, this);
ExtensionSystem::PluginManager::addObject(m_d->m_displaySettingsPage);
m_d->m_highlighterSettingsPage =
new HighlighterSettingsPage(QLatin1String(Constants::TEXT_EDITOR_HIGHLIGHTER_SETTINGS), this);
new HighlighterSettingsPage(Constants::TEXT_EDITOR_HIGHLIGHTER_SETTINGS, this);
ExtensionSystem::PluginManager::addObject(m_d->m_highlighterSettingsPage);
m_d->m_snippetsSettingsPage =
new SnippetsSettingsPage(QLatin1String(Constants::TEXT_EDITOR_SNIPPETS_SETTINGS), this);
new SnippetsSettingsPage(Constants::TEXT_EDITOR_SNIPPETS_SETTINGS, this);
ExtensionSystem::PluginManager::addObject(m_d->m_snippetsSettingsPage);
connect(m_d->m_fontSettingsPage, SIGNAL(changed(TextEditor::FontSettings)),

2
src/plugins/todo/optionspage.cpp
View File

@@ -49,7 +49,7 @@ OptionsPage::OptionsPage(const Settings &settings, QObject *parent) :
{
setSettings(settings);
setId(QLatin1String("TodoSettings"));
setId("TodoSettings");
setDisplayName(tr("To-Do"));
setCategory("To-Do");
setDisplayCategory(tr("To-Do"));

4
src/plugins/valgrind/valgrindsettings.cpp
View File

@@ -172,9 +172,9 @@ QString ValgrindBaseSettings::valgrindExecutable() const
return m_valgrindExecutable;
}
QString ValgrindBaseSettings::id() const
Core::Id ValgrindBaseSettings::id() const
{
return QLatin1String("Analyzer.Valgrind.Settings");
return "Analyzer.Valgrind.Settings";
}
QString ValgrindBaseSettings::displayName() const

2
src/plugins/valgrind/valgrindsettings.h
View File

@@ -55,7 +55,7 @@ public:
virtual QVariantMap defaults() const;
virtual void fromMap(const QVariantMap &map);
virtual QString id() const;
virtual Core::Id id() const;
virtual QString displayName() const;
signals:

2
src/plugins/vcsbase/commonsettingspage.cpp
View File

@@ -109,7 +109,7 @@ CommonOptionsPage::CommonOptionsPage(QObject *parent) :
{
m_settings.fromSettings(Core::ICore::settings());
setId(QLatin1String(Constants::VCS_COMMON_SETTINGS_ID));
setId(Constants::VCS_COMMON_SETTINGS_ID);
setDisplayName(QCoreApplication::translate("VcsBase", Constants::VCS_COMMON_SETTINGS_NAME));
}