forked from qt-creator/qt-creator
Debugger: remove isEditorDebuggable
It was returning 'true' unconditionally for a while. Change-Id: Ia99bdb3c525641f757dacbba148b68d677f4d632 Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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(' ', '.');
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user