diff options
| author | hjk <qtc-committer@nokia.com> | 2012-05-22 11:17:13 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-05-23 10:48:04 +0200 |
| commit | f77cd29e54f832cbb72533842acb4dda655540f1 (patch) | |
| tree | e6557c80b3c1875fb0c7b215919b3fa5bee97d1c /src/plugins/debugger/commonoptionspage.cpp | |
| parent | 444445ceb3cef3f406ae6e68ee5c2505de2762cc (diff) | |
| download | qt-creator-f77cd29e54f832cbb72533842acb4dda655540f1.tar.gz | |
IOptionsPage: replace virtual fuctions by data members
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/debugger/commonoptionspage.cpp')
| -rw-r--r-- | src/plugins/debugger/commonoptionspage.cpp | 59 |
1 files changed, 12 insertions, 47 deletions
diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index ce3460b3b6..5292673682 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -152,36 +152,17 @@ void CommonOptionsPageWidget::setGlobalOptions(const GlobalDebuggerOptions &go) CommonOptionsPage::CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions> &go) : m_options(go) { + setId(QLatin1String(DEBUGGER_COMMON_SETTINGS_ID)); + setDisplayName(QCoreApplication::translate("Debugger", "General")); + setCategory(QLatin1String(DEBUGGER_SETTINGS_CATEGORY)); + setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY)); + setCategoryIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } CommonOptionsPage::~CommonOptionsPage() { } -QString CommonOptionsPage::id() const -{ - return _(DEBUGGER_COMMON_SETTINGS_ID); -} - -QString CommonOptionsPage::displayName() const -{ - return QCoreApplication::translate("Debugger", "General"); -} - -QString CommonOptionsPage::category() const -{ - return _(DEBUGGER_SETTINGS_CATEGORY); -} - -QString CommonOptionsPage::displayCategory() const -{ - return QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY);} - -QIcon CommonOptionsPage::categoryIcon() const -{ - return QIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); -} - void CommonOptionsPage::apply() { QTC_ASSERT(!m_widget.isNull() && !m_group.isNull(), return); @@ -220,34 +201,18 @@ bool CommonOptionsPage::matches(const QString &s) const /////////////////////////////////////////////////////////////////////// // -// DebuggingHelperOptionPage +// LocalsAndExpressionsOptionsPage // /////////////////////////////////////////////////////////////////////// -QString LocalsAndExpressionsOptionsPage::id() const -{ - return _("Z.LocalsAndExpressions"); -} - -QString LocalsAndExpressionsOptionsPage::displayName() const +LocalsAndExpressionsOptionsPage::LocalsAndExpressionsOptionsPage() { + setId(QLatin1String("Z.LocalsAndExpressions")); //: '&&' will appear as one (one is marking keyboard shortcut) - return QCoreApplication::translate("Debugger", "Locals && Expressions"); -} - -QString LocalsAndExpressionsOptionsPage::category() const -{ - return _(DEBUGGER_SETTINGS_CATEGORY); -} - -QString LocalsAndExpressionsOptionsPage::displayCategory() const -{ - return QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY); -} - -QIcon LocalsAndExpressionsOptionsPage::categoryIcon() const -{ - return QIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); + setDisplayName(QCoreApplication::translate("Debugger", "Locals && Expressions")); + setCategory(QLatin1String(DEBUGGER_SETTINGS_CATEGORY)); + setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY)); + setCategoryIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } void LocalsAndExpressionsOptionsPage::apply() |