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

TextEditorWidget: Simplify code

Browse Source 
* Prevent potential nullptr access while at it.

Change-Id: Icee9e711b8a09b11e5644b0643d4751909b96101
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-05 15:13:35 +01:00
parent 5a58e96237
commit c7f19dc0a6
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/texteditor/texteditor.cpp
View File

@@ -2617,17 +2617,21 @@ void TextEditorWidget::convertPosition(int pos, int *line, int *column) const
bool TextEditorWidget::event(QEvent *e)
{
if (!d)
return QPlainTextEdit::event(e);
// FIXME: That's far too heavy, and triggers e.g for ChildEvent
if (d && e->type() != QEvent::InputMethodQuery)
d->m_contentsChanged = false;
switch (e->type()) {
case QEvent::InputMethodQuery:
d->m_contentsChanged = false;
break;
case QEvent::ShortcutOverride:
if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape && d->m_snippetOverlay->isVisible()) {
e->accept();
return true;
} else {
e->ignore(); // we are a really nice citizen
d->m_maybeFakeTooltipEvent = false;
}
e->ignore(); // we are a really nice citizen
d->m_maybeFakeTooltipEvent = false;
return true;
case QEvent::ApplicationPaletteChange: {
// slight hack: ignore palette changes