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

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