Commit ee899520 authored by hjk's avatar hjk
Browse files

debugger: remove editorAboutToClose connection

The slot was doing what was going to happen anyway.
parent 0194da73
...@@ -980,7 +980,6 @@ public slots: ...@@ -980,7 +980,6 @@ public slots:
} }
void editorOpened(Core::IEditor *editor); void editorOpened(Core::IEditor *editor);
void editorAboutToClose(Core::IEditor *editor);
void setBusyCursor(bool busy); void setBusyCursor(bool busy);
void requestMark(TextEditor::ITextEditor *editor, int lineNumber); void requestMark(TextEditor::ITextEditor *editor, int lineNumber);
void showToolTip(TextEditor::ITextEditor *editor, void showToolTip(TextEditor::ITextEditor *editor,
...@@ -1754,7 +1753,7 @@ bool DebuggerPluginPrivate::attachCmdLine() ...@@ -1754,7 +1753,7 @@ bool DebuggerPluginPrivate::attachCmdLine()
return true; return true;
} }
void DebuggerPluginPrivate::editorOpened(Core::IEditor *editor) void DebuggerPluginPrivate::editorOpened(IEditor *editor)
{ {
if (!isDebuggable(editor)) if (!isDebuggable(editor))
return; return;
...@@ -1772,25 +1771,7 @@ void DebuggerPluginPrivate::editorOpened(Core::IEditor *editor) ...@@ -1772,25 +1771,7 @@ void DebuggerPluginPrivate::editorOpened(Core::IEditor *editor)
SLOT(requestContextMenu(TextEditor::ITextEditor*,int,QMenu*))); SLOT(requestContextMenu(TextEditor::ITextEditor*,int,QMenu*)));
} }
void DebuggerPluginPrivate::editorAboutToClose(Core::IEditor *editor) void DebuggerPluginPrivate::requestContextMenu(ITextEditor *editor,
{
if (!isDebuggable(editor))
return;
ITextEditor *textEditor = qobject_cast<ITextEditor *>(editor);
if (!textEditor)
return;
disconnect(textEditor,
SIGNAL(markRequested(TextEditor::ITextEditor*,int)),
this, SLOT(requestMark(TextEditor::ITextEditor*,int)));
disconnect(editor,
SIGNAL(tooltipOverrideRequested(TextEditor::ITextEditor*,QPoint,int,bool*)),
this, SLOT(showToolTip(TextEditor::ITextEditor*,QPoint,int,bool*)));
disconnect(textEditor,
SIGNAL(markContextMenuRequested(TextEditor::ITextEditor*,int,QMenu*)),
this, SLOT(requestContextMenu(TextEditor::ITextEditor*,int,QMenu*)));
}
void DebuggerPluginPrivate::requestContextMenu(TextEditor::ITextEditor *editor,
int lineNumber, QMenu *menu) int lineNumber, QMenu *menu)
{ {
if (!isDebuggable(editor)) if (!isDebuggable(editor))
...@@ -3084,8 +3065,6 @@ void DebuggerPluginPrivate::extensionsInitialized() ...@@ -3084,8 +3065,6 @@ void DebuggerPluginPrivate::extensionsInitialized()
// EditorManager // EditorManager
QObject *editorManager = core->editorManager(); QObject *editorManager = core->editorManager();
connect(editorManager, SIGNAL(editorAboutToClose(Core::IEditor*)),
SLOT(editorAboutToClose(Core::IEditor*)));
connect(editorManager, SIGNAL(editorOpened(Core::IEditor*)), connect(editorManager, SIGNAL(editorOpened(Core::IEditor*)),
SLOT(editorOpened(Core::IEditor*))); SLOT(editorOpened(Core::IEditor*)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment