From 794b41581b5edd563bb0131e9f8528366d0fcd56 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Thu, 24 Jan 2013 16:03:21 +0100
Subject: [PATCH] Debugger: remove isEditorDebuggable
It was returning 'true' unconditionally for a while.
Change-Id: Ia99bdb3c525641f757dacbba148b68d677f4d632
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/debugger/debuggerplugin.cpp | 5 -----
src/plugins/debugger/debuggertooltipmanager.cpp | 4 ++--
src/plugins/debugger/watchutils.cpp | 10 ----------
src/plugins/debugger/watchutils.h | 1 -
4 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f204b44862b..a1e155a376b 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1821,8 +1821,6 @@ void DebuggerPluginPrivate::runScheduled()
void DebuggerPluginPrivate::editorOpened(IEditor *editor)
{
- if (!isEditorDebuggable(editor))
- return;
ITextEditor *textEditor = qobject_cast<ITextEditor *>(editor);
if (!textEditor)
return;
@@ -1843,9 +1841,6 @@ void DebuggerPluginPrivate::updateBreakMenuItem(IEditor *editor)
void DebuggerPluginPrivate::requestContextMenu(ITextEditor *editor,
int lineNumber, QMenu *menu)
{
- if (!isEditorDebuggable(editor))
- return;
-
BreakpointMenuContextData args;
args.lineNumber = lineNumber;
bool contextUsable = true;
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index 05185aeb604..90a4da7d810 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -220,7 +220,7 @@ public:
DebuggerToolTipEditor::DebuggerToolTipEditor(IEditor *ie) :
textEditor(0), baseTextEditor(0), document(0)
{
- if (ie && ie->document() && isEditorDebuggable(ie)) {
+ if (ie && ie->document()) {
if (ITextEditor *te = qobject_cast<ITextEditor *>(ie)) {
if (BaseTextEditorWidget *pe = qobject_cast<BaseTextEditorWidget *>(ie->widget())) {
textEditor = te;
@@ -1435,7 +1435,7 @@ void DebuggerToolTipManager::slotTooltipOverrideRequested(ITextEditor *editor,
break; // Avoid flicker.
DebuggerCore *core = debuggerCore();
- if (!isEditorDebuggable(editor) || !core->boolSetting(UseToolTipsInMainEditor))
+ if (!core->boolSetting(UseToolTipsInMainEditor))
break;
currentEngine = core->currentEngine();
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index a3df9c3bbc6..ad079eb27a5 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -145,16 +145,6 @@ QDebug operator<<(QDebug d, const Scope &scope)
namespace Debugger {
namespace Internal {
-bool isEditorDebuggable(Core::IEditor *editor)
-{
- // Only blacklist Qml. Whitelisting would fail on C++ code in files
- // with strange names, more harm would be done this way.
- // IDocument *file = editor->document();
- // return !(file && file->mimeType() == "application/x-qml");
- // Nowadays, even Qml is debuggable.
- return editor;
-}
-
QByteArray dotEscape(QByteArray str)
{
str.replace(' ', '.');
diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h
index 11d3f0566a0..aef4ad1b42f 100644
--- a/src/plugins/debugger/watchutils.h
+++ b/src/plugins/debugger/watchutils.h
@@ -51,7 +51,6 @@ namespace Internal {
class WatchData;
class GdbMi;
-bool isEditorDebuggable(Core::IEditor *editor);
QByteArray dotEscape(QByteArray str);
QString currentTime();
bool isSkippableFunction(const QString &funcName, const QString &fileName);
--
GitLab