diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-12-13 01:18:33 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2015-12-18 11:54:12 +0000 |
| commit | 9d3b2f09986ef23afc9907c60acc9331697225ea (patch) | |
| tree | f0baefe87dab138a59dd5b93bba45283e32069d4 /src/plugins/texteditor/codeassist/genericproposalwidget.cpp | |
| parent | b6131e1b1dfc471e869d650ff97a6b119ec2325c (diff) | |
| download | qt-creator-9d3b2f09986ef23afc9907c60acc9331697225ea.tar.gz | |
TextEditor: Use Qt5-style connects
The heavy lifting was done by clazy.
Change-Id: I380120e3419d2a3c0e272f51cc3e0d5f6aaa5e9b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/texteditor/codeassist/genericproposalwidget.cpp')
| -rw-r--r-- | src/plugins/texteditor/codeassist/genericproposalwidget.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 063bedb956..992cd8bd23 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -265,7 +265,6 @@ public: CodeAssistant *m_assistant; bool m_autoWidth; -public slots: void handleActivation(const QModelIndex &modelIndex); void maybeShowInfoTip(); }; @@ -280,12 +279,12 @@ GenericProposalWidgetPrivate::GenericProposalWidgetPrivate(QWidget *completionWi , m_assistant(0) , m_autoWidth(true) { - connect(m_completionListView, SIGNAL(activated(QModelIndex)), - this, SLOT(handleActivation(QModelIndex))); + connect(m_completionListView, &QAbstractItemView::activated, + this, &GenericProposalWidgetPrivate::handleActivation); m_infoTimer.setInterval(Constants::COMPLETION_ASSIST_TOOLTIP_DELAY); m_infoTimer.setSingleShot(true); - connect(&m_infoTimer, SIGNAL(timeout()), SLOT(maybeShowInfoTip())); + connect(&m_infoTimer, &QTimer::timeout, this, &GenericProposalWidgetPrivate::maybeShowInfoTip); } void GenericProposalWidgetPrivate::handleActivation(const QModelIndex &modelIndex) @@ -342,12 +341,12 @@ GenericProposalWidget::GenericProposalWidget() d->m_completionListView->setSelectionMode(QAbstractItemView::SingleSelection); d->m_completionListView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); d->m_completionListView->setMinimumSize(1, 1); - connect(d->m_completionListView->verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(updatePositionAndSize())); - connect(d->m_completionListView->verticalScrollBar(), SIGNAL(sliderPressed()), - this, SLOT(turnOffAutoWidth())); - connect(d->m_completionListView->verticalScrollBar(), SIGNAL(sliderReleased()), - this, SLOT(turnOnAutoWidth())); + connect(d->m_completionListView->verticalScrollBar(), &QAbstractSlider::valueChanged, + this, &GenericProposalWidget::updatePositionAndSize); + connect(d->m_completionListView->verticalScrollBar(), &QAbstractSlider::sliderPressed, + this, &GenericProposalWidget::turnOffAutoWidth); + connect(d->m_completionListView->verticalScrollBar(), &QAbstractSlider::sliderReleased, + this, &GenericProposalWidget::turnOnAutoWidth); QVBoxLayout *layout = new QVBoxLayout(this); layout->setMargin(0); @@ -394,10 +393,8 @@ void GenericProposalWidget::setModel(IAssistProposalModel *model) d->m_model = static_cast<GenericProposalModel *>(model); d->m_completionListView->setModel(new ModelAdapter(d->m_model, d->m_completionListView)); - connect(d->m_completionListView->selectionModel(), - SIGNAL(currentChanged(QModelIndex,QModelIndex)), - &d->m_infoTimer, - SLOT(start())); + connect(d->m_completionListView->selectionModel(), &QItemSelectionModel::currentChanged, + &d->m_infoTimer, static_cast<void (QTimer::*)()>(&QTimer::start)); } void GenericProposalWidget::setDisplayRect(const QRect &rect) |