modernize: Replace most remaining old-style connects by PMF ones

[quassel.git] / src / qtui / chatviewsearchcontroller.cpp

diff --git a/src/qtui/chatviewsearchcontroller.cpp b/src/qtui/chatviewsearchcontroller.cpp
index 930aea5..f12bfa0 100644 (file)
--- a/src/qtui/chatviewsearchcontroller.cpp
+++ b/src/qtui/chatviewsearchcontroller.cpp
@@ -69,9 +69,9 @@ void ChatViewSearchController::setScene(ChatScene *scene)
     if (!scene)
         return;
 
-    connect(_scene, SIGNAL(destroyed()), this, SLOT(sceneDestroyed()));
-    connect(_scene, SIGNAL(layoutChanged()), this, SLOT(repositionHighlights()));
-    connect(Client::messageModel(), SIGNAL(finishedBacklogFetch(BufferId)), this, SLOT(updateHighlights()));
+    connect(_scene, &QObject::destroyed, this, &ChatViewSearchController::sceneDestroyed);
+    connect(_scene, &ChatScene::layoutChanged, this, [this]() { repositionHighlights(); });
+    connect(Client::messageModel(), &MessageModel::finishedBacklogFetch, this, [this]() { updateHighlights(); });
     updateHighlights();
 }
 
@@ -118,7 +118,7 @@ void ChatViewSearchController::updateHighlights(bool reuse)
     if (reuse) {
         QSet<ChatLine *> chatLines;
         foreach(SearchHighlightItem *highlightItem, _highlightItems) {
-            ChatLine *line = qgraphicsitem_cast<ChatLine *>(highlightItem->parentItem());
+            auto *line = qgraphicsitem_cast<ChatLine *>(highlightItem->parentItem());
             if (line)
                 chatLines << line;
         }
@@ -145,7 +145,7 @@ void ChatViewSearchController::updateHighlights(bool reuse)
                 int start = 0; int end = _highlightItems.count() - 1;
                 QPointF startPos;
                 QPointF endPos;
-                while (1) {
+                while (true) {
                     startPos = _highlightItems[start]->scenePos();
                     endPos = _highlightItems[end]->scenePos();
                     if (startPos == oldHighlightPos) {
@@ -259,7 +259,7 @@ void ChatViewSearchController::updateHighlights(ChatLine *line)
     }
 
     foreach(QGraphicsItem *child, line->childItems()) {
-        SearchHighlightItem *highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
+        auto *highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
         if (!highlightItem)
             continue;
 
@@ -304,7 +304,7 @@ void ChatViewSearchController::repositionHighlights()
 {
     QSet<ChatLine *> chatLines;
     foreach(SearchHighlightItem *item, _highlightItems) {
-        ChatLine *line = qgraphicsitem_cast<ChatLine *>(item->parentItem());
+        auto *line = qgraphicsitem_cast<ChatLine *>(item->parentItem());
         if (line)
             chatLines << line;
     }
@@ -319,7 +319,7 @@ void ChatViewSearchController::repositionHighlights(ChatLine *line)
 {
     QList<SearchHighlightItem *> searchHighlights;
     foreach(QGraphicsItem *child, line->childItems()) {
-        SearchHighlightItem *highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
+        auto *highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
         if (highlightItem)
             searchHighlights << highlightItem;
     }
@@ -422,7 +422,7 @@ SearchHighlightItem::SearchHighlightItem(QRectF wordRect, QGraphicsItem *parent)
     setPos(wordRect.x(), wordRect.y());
     updateGeometry(wordRect.width(), wordRect.height());
 
-    connect(&_timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(updateHighlight(qreal)));
+    connect(&_timeLine, &QTimeLine::valueChanged, this, &SearchHighlightItem::updateHighlight);
 }