TextEditor: Use Qt5-style connects

The heavy lifting was done by clazy.

Change-Id: I380120e3419d2a3c0e272f51cc3e0d5f6aaa5e9b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

4 files changed, 14 insertions, 21 deletions

diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
index 1123778c8f..30d84cfce5 100644
--- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
+++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
@@ -113,8 +113,8 @@ FunctionHintProposalWidget::FunctionHintProposalWidget()
     popupLayout->addWidget(d->m_pager);
     popupLayout->addWidget(d->m_hintLabel);
 
-    connect(upArrow, SIGNAL(clicked()), SLOT(previousPage()));
-    connect(downArrow, SIGNAL(clicked()), SLOT(nextPage()));
+    connect(upArrow, &QAbstractButton::clicked, this, &FunctionHintProposalWidget::previousPage);
+    connect(downArrow, &QAbstractButton::clicked, this, &FunctionHintProposalWidget::nextPage);
     connect(d->m_popupFrame.data(), &QObject::destroyed, this, &FunctionHintProposalWidget::abort);
 
     setFocusPolicy(Qt::NoFocus);
diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h
index 3b4b68d141..05acfbd40b 100644
--- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h
+++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h
@@ -61,11 +61,9 @@ public:
 protected:
     bool eventFilter(QObject *o, QEvent *e) override;
 
-private slots:
+private:
     void nextPage();
     void previousPage();
-
-private:
     bool updateAndCheck(const QString &prefix);
     void updateContent();
     void updatePosition();
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)
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.h b/src/plugins/texteditor/codeassist/genericproposalwidget.h
index 39ae7c4e29..c016e2a862 100644
--- a/src/plugins/texteditor/codeassist/genericproposalwidget.h
+++ b/src/plugins/texteditor/codeassist/genericproposalwidget.h
@@ -66,8 +66,6 @@ private:
     bool updateAndCheck(const QString &prefix);
     void notifyActivation(int index);
     void abort();
-
-private slots:
     void updatePositionAndSize();
     void turnOffAutoWidth();
     void turnOnAutoWidth();