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

Debugger: modernize ConsoleItem editor connect

Browse Source 
Change-Id: Iac2fb696779e02c2fe5296c4f9981c20d21bb3a8
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-05-19 12:44:27 +02:00
parent f54dcc4c81
commit cf9d1d5f8e
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/console/consoleitemdelegate.cpp
View File

@@ -318,8 +318,11 @@ QWidget *ConsoleItemDelegate::createEditor(QWidget *parent,
"background-origin: margin;"
"background-repeat: none;"
"}"));
connect(editor, &ConsoleEdit::editingFinished,
this, &ConsoleItemDelegate::commitAndCloseEditor);
connect(editor, &ConsoleEdit::editingFinished, this, [this, editor] {
auto delegate = const_cast<ConsoleItemDelegate*>(this);
emit delegate->commitData(editor);
emit delegate->closeEditor(editor);
});
return editor;
}
@@ -353,13 +356,6 @@ void ConsoleItemDelegate::currentChanged(const QModelIndex &current,
emit sizeHintChanged(previous);
}
void ConsoleItemDelegate::commitAndCloseEditor()
{
ConsoleEdit *editor = qobject_cast<ConsoleEdit *>(sender());
emit commitData(editor);
emit closeEditor(editor);
}
qreal ConsoleItemDelegate::layoutText(QTextLayout &tl, int width,
bool *showFileLineInfo) const
{

3
src/plugins/debugger/console/consoleitemdelegate.h
View File

@@ -61,9 +61,6 @@ protected:
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
const QModelIndex &index) const;
private slots:
void commitAndCloseEditor();
private:
qreal layoutText(QTextLayout &tl, int width, bool *success = 0) const;