diff options
-rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 5 | ||||
-rw-r--r-- | src/plugins/debugger/debuggertooltipmanager.cpp | 4 | ||||
-rw-r--r-- | src/plugins/debugger/watchutils.cpp | 10 | ||||
-rw-r--r-- | 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 f204b44862..a1e155a376 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 05185aeb60..90a4da7d81 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 a3df9c3bbc..ad079eb27a 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 11d3f0566a..aef4ad1b42 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); |