From 5645018b158427093946f3b6494599e4fdb49508 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 21 Apr 2011 14:02:26 +0200 Subject: [PATCH] debugger: remove custom dumper location settings Reviewed-by: con --- src/plugins/debugger/commonoptionspage.cpp | 22 ------------------- src/plugins/debugger/debuggeractions.cpp | 14 ------------ src/plugins/debugger/debuggeractions.h | 2 -- src/plugins/debugger/debuggerengine.cpp | 9 -------- src/plugins/debugger/dumperoptionpage.ui | 25 ---------------------- 5 files changed, 72 deletions(-) diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index 36f5dd33e59..e991aa0b573 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -214,12 +214,6 @@ bool CommonOptionsPage::matches(const QString &s) const // /////////////////////////////////////////////////////////////////////// -static bool oxygenStyle() -{ - const ManhattanStyle *ms = qobject_cast(qApp->style()); - return ms && !qstrcmp("OxygenStyle", ms->baseStyle()->metaObject()->className()); -} - QString DebuggingHelperOptionPage::id() const { return _("Z.DebuggingHelper"); @@ -260,25 +254,11 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent) QWidget *w = new QWidget(parent); m_ui.setupUi(w); - m_ui.dumperLocationChooser->setExpectedKind(Utils::PathChooser::Command); - m_ui.dumperLocationChooser->setPromptDialogTitle(QCoreApplication::translate - ("Debugger", "Choose DebuggingHelper Location")); - m_ui.dumperLocationChooser->setInitialBrowsePathBackup( - ICore::instance()->resourcePath() + "../../lib"); - m_group.clear(); DebuggerCore *dc = debuggerCore(); m_group.insert(dc->action(UseDebuggingHelpers), m_ui.debuggingHelperGroupBox); - m_group.insert(dc->action(UseCustomDebuggingHelperLocation), - m_ui.customLocationGroupBox); - // Suppress Oxygen style's giving flat group boxes bold titles. - if (oxygenStyle()) - m_ui.customLocationGroupBox->setStyleSheet(_("QGroupBox::title { font: ; }")); - - m_group.insert(dc->action(CustomDebuggingHelperLocation), - m_ui.dumperLocationChooser); m_group.insert(dc->action(UseCodeModel), m_ui.checkBoxUseCodeModel); @@ -299,8 +279,6 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent) if (m_searchKeywords.isEmpty()) { QTextStream(&m_searchKeywords) << ' ' << m_ui.debuggingHelperGroupBox->title() - << ' ' << m_ui.customLocationGroupBox->title() - << ' ' << m_ui.dumperLocationLabel->text() << ' ' << m_ui.checkBoxUseCodeModel->text() << ' ' << m_ui.checkBoxShowThreadNames->text(); m_searchKeywords.remove(QLatin1Char('&')); diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index 74f8f36ea3c..bb8f8de0104 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -258,20 +258,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings) item->setValue(true); insertItem(UseDebuggingHelpers, item); - item = new SavedAction(this); - item->setSettingsKey(debugModeGroup, QLatin1String("UseCustomDebuggingHelperLocation")); - item->setCheckable(true); - item->setDefaultValue(false); - item->setValue(false); - insertItem(UseCustomDebuggingHelperLocation, item); - - item = new SavedAction(this); - item->setSettingsKey(debugModeGroup, QLatin1String("CustomDebuggingHelperLocation")); - item->setCheckable(true); - item->setDefaultValue(QString()); - item->setValue(QString()); - insertItem(CustomDebuggingHelperLocation, item); - item = new SavedAction(this); item->setSettingsKey(debugModeGroup, QLatin1String("UseCodeModel")); item->setText(tr("Use Code Model")); diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h index eaa9c52d92a..fe5396a8d8c 100644 --- a/src/plugins/debugger/debuggeractions.h +++ b/src/plugins/debugger/debuggeractions.h @@ -100,8 +100,6 @@ enum DebuggerActionCode SwitchModeOnExit, UseDebuggingHelpers, - UseCustomDebuggingHelperLocation, - CustomDebuggingHelperLocation, UseCodeModel, ShowThreadNames, diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 93f0eefffc5..b151f73f7d0 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -646,13 +646,6 @@ bool DebuggerEngine::qtDumperLibraryEnabled() const QStringList DebuggerEngine::qtDumperLibraryLocations() const { - if (debuggerCore()->action(UseCustomDebuggingHelperLocation)->value().toBool()) { - const QString customLocation = - debuggerCore()->action(CustomDebuggingHelperLocation)->value().toString(); - const QString location = - tr("%1 (explicitly set in the Debugger Options)").arg(customLocation); - return QStringList(location); - } return d->m_startParameters.dumperLibraryLocations; } @@ -663,8 +656,6 @@ void DebuggerEngine::showQtDumperLibraryWarning(const QString &details) QString DebuggerEngine::qtDumperLibraryName() const { - if (debuggerCore()->action(UseCustomDebuggingHelperLocation)->value().toBool()) - return debuggerCore()->action(CustomDebuggingHelperLocation)->value().toString(); return startParameters().dumperLibrary; } diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui index 3dcf2478167..ff71eb9f697 100644 --- a/src/plugins/debugger/dumperoptionpage.ui +++ b/src/plugins/debugger/dumperoptionpage.ui @@ -50,31 +50,6 @@ true - - - - Use debugging helper from custom location - - - true - - - true - - - - - - Location: - - - - - - - - -