feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: replace action(ExecuteCommand) be a direct function call

Browse Source
This commit is contained in:
hjk
2011-02-16 12:41:06 +01:00
parent e360083427
commit 0b662609a0
10 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/debugger/logwindow.cpp
View File

@@ -203,9 +203,6 @@ public:
QMenu *menu = createStandardContextMenu();
menu->addAction(m_clearContentsAction);
menu->addAction(m_saveContentsAction); // X11 clipboard is unreliable for long texts
addContextActions(menu);
debuggerCore()->action(ExecuteCommand)->setData(textCursor().block().text());
menu->addAction(debuggerCore()->action(ExecuteCommand));
menu->addAction(debuggerCore()->action(LogTimeStamps));
menu->addAction(debuggerCore()->action(VerboseLog));
menu->addSeparator();
@@ -214,7 +211,6 @@ public:
delete menu;
}
virtual void addContextActions(QMenu *) {}
private slots:
void saveContents();
@@ -254,7 +250,7 @@ private:
void keyPressEvent(QKeyEvent *ev)
{
if (ev->modifiers() == Qt::ControlModifier && ev->key() == Qt::Key_Return)
debuggerCore()->action(ExecuteCommand)->trigger(textCursor().block().text());
debuggerCore()->executeDebuggerCommand(textCursor().block().text());
else if (ev->modifiers() == Qt::ControlModifier && ev->key() == Qt::Key_R)
emit clearContentsRequested();
else
@@ -280,11 +276,6 @@ private:
emit commandSelected(n);
}
void addContextActions(QMenu *menu)
{
menu->addAction(debuggerCore()->action(ExecuteCommand));
}
void focusInEvent(QFocusEvent *ev)
{
emit statusMessageRequested(tr("Type Ctrl-<Return> to execute a line."), -1);
@@ -351,7 +342,7 @@ LogWindow::LogWindow(QWidget *parent)
setWindowTitle(tr("Debugger Log"));
setObjectName("Log");
QSplitter *m_splitter = new Core::MiniSplitter(Qt::Horizontal);
QSplitter *m_splitter = new Core::MiniSplitter(Qt::Horizontal);
m_splitter->setParent(this);
// Mixed input/output.
@@ -414,7 +405,7 @@ LogWindow::LogWindow(QWidget *parent)
void LogWindow::sendCommand()
{
debuggerCore()->action(ExecuteCommand)->trigger(m_commandEdit->text());
debuggerCore()->executeDebuggerCommand(m_commandEdit->text());
}
void LogWindow::showOutput(int channel, const QString &output)