X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchcontroller.cpp;h=b81e261aa943a3a86855252b3aecae6eef48e198;hp=930aea52759cb4183602b26aebb7a88c17cc06ef;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=158443f71d48215eea8b47b836b61afd77654b78

diff --git a/src/qtui/chatviewsearchcontroller.cpp b/src/qtui/chatviewsearchcontroller.cpp
index 930aea52..b81e261a 100644
--- a/src/qtui/chatviewsearchcontroller.cpp
+++ b/src/qtui/chatviewsearchcontroller.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,13 +29,11 @@
 #include "chatscene.h"
 #include "messagemodel.h"
 
-ChatViewSearchController::ChatViewSearchController(QObject *parent)
+ChatViewSearchController::ChatViewSearchController(QObject* parent)
     : QObject(parent)
-{
-}
-
+{}
 
-void ChatViewSearchController::setSearchString(const QString &searchString)
+void ChatViewSearchController::setSearchString(const QString& searchString)
 {
     QString oldSearchString = _searchString;
     _searchString = searchString;
@@ -51,8 +49,7 @@ void ChatViewSearchController::setSearchString(const QString &searchString)
     }
 }
 
-
-void ChatViewSearchController::setScene(ChatScene *scene)
+void ChatViewSearchController::setScene(ChatScene* scene)
 {
     Q_ASSERT(scene);
     if (scene == _scene)
@@ -69,13 +66,12 @@ 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();
 }
 
-
 void ChatViewSearchController::highlightNext()
 {
     if (_highlightItems.isEmpty())
@@ -92,7 +88,6 @@ void ChatViewSearchController::highlightNext()
     emit newCurrentHighlight(_highlightItems.at(_currentHighlight));
 }
 
-
 void ChatViewSearchController::highlightPrev()
 {
     if (_highlightItems.isEmpty())
@@ -109,20 +104,19 @@ void ChatViewSearchController::highlightPrev()
     emit newCurrentHighlight(_highlightItems.at(_currentHighlight));
 }
 
-
 void ChatViewSearchController::updateHighlights(bool reuse)
 {
     if (!_scene)
         return;
 
     if (reuse) {
-        QSet<ChatLine *> chatLines;
-        foreach(SearchHighlightItem *highlightItem, _highlightItems) {
-            ChatLine *line = qgraphicsitem_cast<ChatLine *>(highlightItem->parentItem());
+        QSet<ChatLine*> chatLines;
+        foreach (SearchHighlightItem* highlightItem, _highlightItems) {
+            auto* line = qgraphicsitem_cast<ChatLine*>(highlightItem->parentItem());
             if (line)
                 chatLines << line;
         }
-        foreach(ChatLine *line, QList<ChatLine *>(chatLines.toList())) {
+        foreach (ChatLine* line, QList<ChatLine*>(chatLines.toList())) {
             updateHighlights(line);
         }
     }
@@ -142,10 +136,11 @@ void ChatViewSearchController::updateHighlights(bool reuse)
 
         if (!_highlightItems.isEmpty()) {
             if (!oldHighlightPos.isNull()) {
-                int start = 0; int end = _highlightItems.count() - 1;
+                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) {
@@ -209,10 +204,9 @@ void ChatViewSearchController::updateHighlights(bool reuse)
     }
 }
 
-
 void ChatViewSearchController::checkMessagesForHighlight(int start, int end)
 {
-    QAbstractItemModel *model = _scene->model();
+    QAbstractItemModel* model = _scene->model();
     Q_ASSERT(model);
 
     if (end == -1) {
@@ -232,25 +226,24 @@ void ChatViewSearchController::checkMessagesForHighlight(int start, int end)
     }
 }
 
-
-void ChatViewSearchController::updateHighlights(ChatLine *line)
+void ChatViewSearchController::updateHighlights(ChatLine* line)
 {
-    QList<ChatItem *> checkItems;
+    QList<ChatItem*> checkItems;
     if (_searchSenders)
         checkItems << line->item(MessageModel::SenderColumn);
 
     if (_searchMsgs)
         checkItems << line->item(MessageModel::ContentsColumn);
 
-    QHash<quint64, QHash<quint64, QRectF> > wordRects;
-    foreach(ChatItem *item, checkItems) {
-        foreach(QRectF wordRect, item->findWords(searchString(), caseSensitive())) {
+    QHash<quint64, QHash<quint64, QRectF>> wordRects;
+    foreach (ChatItem* item, checkItems) {
+        foreach (QRectF wordRect, item->findWords(searchString(), caseSensitive())) {
             wordRects[(quint64)(wordRect.x() + item->x())][(quint64)(wordRect.y())] = wordRect;
         }
     }
 
     bool deleteAll = false;
-    QAbstractItemModel *model = _scene->model();
+    QAbstractItemModel* model = _scene->model();
     Q_ASSERT(model);
     if (_searchOnlyRegularMsgs) {
         QModelIndex index = model->index(line->row(), 0);
@@ -258,13 +251,14 @@ void ChatViewSearchController::updateHighlights(ChatLine *line)
             deleteAll = true;
     }
 
-    foreach(QGraphicsItem *child, line->childItems()) {
-        SearchHighlightItem *highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
+    foreach (QGraphicsItem* child, line->childItems()) {
+        auto* highlightItem = qgraphicsitem_cast<SearchHighlightItem*>(child);
         if (!highlightItem)
             continue;
 
-        if (!deleteAll && wordRects.contains((quint64)(highlightItem->pos().x())) && wordRects[(quint64)(highlightItem->pos().x())].contains((quint64)(highlightItem->pos().y()))) {
-            QRectF &wordRect = wordRects[(quint64)(highlightItem->pos().x())][(quint64)(highlightItem->pos().y())];
+        if (!deleteAll && wordRects.contains((quint64)(highlightItem->pos().x()))
+            && wordRects[(quint64)(highlightItem->pos().x())].contains((quint64)(highlightItem->pos().y()))) {
+            QRectF& wordRect = wordRects[(quint64)(highlightItem->pos().x())][(quint64)(highlightItem->pos().y())];
             highlightItem->updateGeometry(wordRect.width(), wordRect.height());
         }
         else {
@@ -282,44 +276,41 @@ void ChatViewSearchController::updateHighlights(ChatLine *line)
     }
 }
 
-
-void ChatViewSearchController::highlightLine(ChatLine *line)
+void ChatViewSearchController::highlightLine(ChatLine* line)
 {
-    QList<ChatItem *> checkItems;
+    QList<ChatItem*> checkItems;
     if (_searchSenders)
         checkItems << line->item(MessageModel::SenderColumn);
 
     if (_searchMsgs)
         checkItems << line->item(MessageModel::ContentsColumn);
 
-    foreach(ChatItem *item, checkItems) {
-        foreach(QRectF wordRect, item->findWords(searchString(), caseSensitive())) {
+    foreach (ChatItem* item, checkItems) {
+        foreach (QRectF wordRect, item->findWords(searchString(), caseSensitive())) {
             _highlightItems << new SearchHighlightItem(wordRect.adjusted(item->x(), 0, item->x(), 0), line);
         }
     }
 }
 
-
 void ChatViewSearchController::repositionHighlights()
 {
-    QSet<ChatLine *> chatLines;
-    foreach(SearchHighlightItem *item, _highlightItems) {
-        ChatLine *line = qgraphicsitem_cast<ChatLine *>(item->parentItem());
+    QSet<ChatLine*> chatLines;
+    foreach (SearchHighlightItem* item, _highlightItems) {
+        auto* line = qgraphicsitem_cast<ChatLine*>(item->parentItem());
         if (line)
             chatLines << line;
     }
-    QList<ChatLine *> chatLineList(chatLines.toList());
-    foreach(ChatLine *line, chatLineList) {
+    QList<ChatLine*> chatLineList(chatLines.toList());
+    foreach (ChatLine* line, chatLineList) {
         repositionHighlights(line);
     }
 }
 
-
-void ChatViewSearchController::repositionHighlights(ChatLine *line)
+void ChatViewSearchController::repositionHighlights(ChatLine* line)
 {
-    QList<SearchHighlightItem *> searchHighlights;
-    foreach(QGraphicsItem *child, line->childItems()) {
-        SearchHighlightItem *highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
+    QList<SearchHighlightItem*> searchHighlights;
+    foreach (QGraphicsItem* child, line->childItems()) {
+        auto* highlightItem = qgraphicsitem_cast<SearchHighlightItem*>(child);
         if (highlightItem)
             searchHighlights << highlightItem;
     }
@@ -329,12 +320,12 @@ void ChatViewSearchController::repositionHighlights(ChatLine *line)
 
     QList<QPointF> wordPos;
     if (_searchSenders) {
-        foreach(QRectF wordRect, line->senderItem()->findWords(searchString(), caseSensitive())) {
+        foreach (QRectF wordRect, line->senderItem()->findWords(searchString(), caseSensitive())) {
             wordPos << QPointF(wordRect.x() + line->senderItem()->x(), wordRect.y());
         }
     }
     if (_searchMsgs) {
-        foreach(QRectF wordRect, line->contentsItem()->findWords(searchString(), caseSensitive())) {
+        foreach (QRectF wordRect, line->contentsItem()->findWords(searchString(), caseSensitive())) {
             wordPos << QPointF(wordRect.x() + line->contentsItem()->x(), wordRect.y());
         }
     }
@@ -347,7 +338,6 @@ void ChatViewSearchController::repositionHighlights(ChatLine *line)
     }
 }
 
-
 void ChatViewSearchController::sceneDestroyed()
 {
     // WARNING: don't call any methods on scene!
@@ -357,7 +347,6 @@ void ChatViewSearchController::sceneDestroyed()
     _highlightItems.clear();
 }
 
-
 void ChatViewSearchController::setCaseSensitive(bool caseSensitive)
 {
     if (_caseSensitive == caseSensitive)
@@ -370,7 +359,6 @@ void ChatViewSearchController::setCaseSensitive(bool caseSensitive)
     updateHighlights(caseSensitive);
 }
 
-
 void ChatViewSearchController::setSearchSenders(bool searchSenders)
 {
     if (_searchSenders == searchSenders)
@@ -382,7 +370,6 @@ void ChatViewSearchController::setSearchSenders(bool searchSenders)
     updateHighlights(!searchSenders);
 }
 
-
 void ChatViewSearchController::setSearchMsgs(bool searchMsgs)
 {
     if (_searchMsgs == searchMsgs)
@@ -395,7 +382,6 @@ void ChatViewSearchController::setSearchMsgs(bool searchMsgs)
     updateHighlights(!searchMsgs);
 }
 
-
 void ChatViewSearchController::setSearchOnlyRegularMsgs(bool searchOnlyRegularMsgs)
 {
     if (_searchOnlyRegularMsgs == searchOnlyRegularMsgs)
@@ -408,24 +394,22 @@ void ChatViewSearchController::setSearchOnlyRegularMsgs(bool searchOnlyRegularMs
     updateHighlights(searchOnlyRegularMsgs);
 }
 
-
 // ==================================================
 //  SearchHighlightItem
 // ==================================================
-SearchHighlightItem::SearchHighlightItem(QRectF wordRect, QGraphicsItem *parent)
-    : QObject(),
-    QGraphicsItem(parent),
-    _highlighted(false),
-    _alpha(70),
-    _timeLine(150)
+SearchHighlightItem::SearchHighlightItem(QRectF wordRect, QGraphicsItem* parent)
+    : QObject()
+    , QGraphicsItem(parent)
+    , _highlighted(false)
+    , _alpha(70)
+    , _timeLine(150)
 {
     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);
 }
 
-
 void SearchHighlightItem::setHighlighted(bool highlighted)
 {
     _highlighted = highlighted;
@@ -441,15 +425,13 @@ void SearchHighlightItem::setHighlighted(bool highlighted)
     update();
 }
 
-
 void SearchHighlightItem::updateHighlight(qreal value)
 {
     _alpha = 70 + (int)(80 * value);
     update();
 }
 
-
-void SearchHighlightItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void SearchHighlightItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
     Q_UNUSED(option);
     Q_UNUSED(widget);
@@ -461,7 +443,6 @@ void SearchHighlightItem::paint(QPainter *painter, const QStyleOptionGraphicsIte
     painter->drawRoundedRect(boundingRect(), radius, radius);
 }
 
-
 void SearchHighlightItem::updateGeometry(qreal width, qreal height)
 {
     prepareGeometryChange();
@@ -470,8 +451,7 @@ void SearchHighlightItem::updateGeometry(qreal width, qreal height)
     update();
 }
 
-
-bool SearchHighlightItem::firstInLine(QGraphicsItem *item1, QGraphicsItem *item2)
+bool SearchHighlightItem::firstInLine(QGraphicsItem* item1, QGraphicsItem* item2)
 {
     if (item1->pos().y() != item2->pos().y())
         return item1->pos().y() < item2->pos().y();