diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-14 11:17:37 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-18 10:58:26 +0100 |
| commit | cb9ac60609979d71f1093e18bb4e94635bdfd1bf (patch) | |
| tree | 457783a7b4dee777ae8ba518da09ba69a36873ab /src/plugins/texteditor/codeassist | |
| parent | 99b2eb1ca9f0515681bf949db0ab6650f857e82b (diff) | |
| download | qt-creator-cb9ac60609979d71f1093e18bb4e94635bdfd1bf.tar.gz | |
TextEditor: Minimize use of ifdefs.
Change-Id: Icc924fda429032d8806caac66230c6fc55b96c53
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/texteditor/codeassist')
| -rw-r--r-- | src/plugins/texteditor/codeassist/genericproposalwidget.cpp | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 3b449cd312..6f9571ec54 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -532,20 +532,29 @@ void GenericProposalWidget::turnOnAutoWidth() updatePositionAndSize(); } +static bool useCarbonWorkaround() +{ +#if (QT_VERSION < 0x050000) && defined(Q_OS_DARWIN) && ! defined(QT_MAC_USE_COCOA) + return true; +#else + return false; +#endif +} + bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e) { if (e->type() == QEvent::FocusOut) { abort(); -#if (QT_VERSION < 0x050000) && defined(Q_OS_DARWIN) && ! defined(QT_MAC_USE_COCOA) - QFocusEvent *fe = static_cast<QFocusEvent *>(e); - if (fe->reason() == Qt::OtherFocusReason) { - // Qt/carbon workaround - // focus out is received before the key press event. - if (d->m_completionListView->currentIndex().isValid()) - emit proposalItemActivated(d->m_model->proposalItem( - d->m_completionListView->currentIndex().row())); + if (useCarbonWorkaround()) { + QFocusEvent *fe = static_cast<QFocusEvent *>(e); + if (fe->reason() == Qt::OtherFocusReason) { + // Qt/carbon workaround + // focus out is received before the key press event. + if (d->m_completionListView->currentIndex().isValid()) + emit proposalItemActivated(d->m_model->proposalItem( + d->m_completionListView->currentIndex().row())); + } } -#endif if (d->m_infoFrame) d->m_infoFrame->close(); return true; @@ -583,12 +592,12 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e) case Qt::Key_Tab: case Qt::Key_Return: -#if (QT_VERSION >= 0x050000) || (defined(QT_MAC_USE_COCOA) || !defined(Q_OS_DARWIN)) - abort(); - if (d->m_completionListView->currentIndex().isValid()) - emit proposalItemActivated(d->m_model->proposalItem( - d->m_completionListView->currentIndex().row())); -#endif + if (!useCarbonWorkaround()) { + abort(); + if (d->m_completionListView->currentIndex().isValid()) + emit proposalItemActivated(d->m_model->proposalItem( + d->m_completionListView->currentIndex().row())); + } return true; case Qt::Key_Up: |