X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchcontroller.h;h=46714e0d4a8666d9c7f1f1e96c7449b87a19c06c;hp=fc67a76f98d3a9cc269107fd3196948097825838;hb=HEAD;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e

diff --git a/src/qtui/chatviewsearchcontroller.h b/src/qtui/chatviewsearchcontroller.h
index fc67a76f..610d0fe9 100644
--- a/src/qtui/chatviewsearchcontroller.h
+++ b/src/qtui/chatviewsearchcontroller.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,7 +21,7 @@
 #ifndef CHATVIEWSEARCHCONTROLLER_H
 #define CHATVIEWSEARCHCONTROLLER_H
 
-#include <QObject>
+#include <QGraphicsItem>
 #include <QHash>
 #include <QPointer>
 #include <QString>
@@ -39,14 +39,14 @@ class ChatViewSearchController : public QObject
     Q_OBJECT
 
 public:
-    ChatViewSearchController(QObject *parent = 0);
+    ChatViewSearchController(QObject* parent = nullptr);
 
-    inline const QString &searchString() const { return _searchString; }
+    inline const QString& searchString() const { return _searchString; }
 
-    void setScene(ChatScene *scene);
+    void setScene(ChatScene* scene);
 
 public slots:
-    void setSearchString(const QString &searchString);
+    void setSearchString(const QString& searchString);
     void setCaseSensitive(bool caseSensitive);
     void setSearchSenders(bool searchSenders);
     void setSearchMsgs(bool searchMsgs);
@@ -60,53 +60,51 @@ private slots:
     void updateHighlights(bool reuse = false);
 
     void repositionHighlights();
-    void repositionHighlights(ChatLine *line);
+    void repositionHighlights(ChatLine* line);
 
 signals:
-    void newCurrentHighlight(QGraphicsItem *highlightItem);
+    void newCurrentHighlight(QGraphicsItem* highlightItem);
 
 private:
     QString _searchString;
-    ChatScene *_scene;
-    QList<SearchHighlightItem *> _highlightItems;
-    int _currentHighlight;
+    ChatScene* _scene{nullptr};
+    QList<SearchHighlightItem*> _highlightItems;
+    int _currentHighlight{0};
 
-    bool _caseSensitive;
-    bool _searchSenders;
-    bool _searchMsgs;
-    bool _searchOnlyRegularMsgs;
+    bool _caseSensitive{false};
+    bool _searchSenders{false};
+    bool _searchMsgs{true};
+    bool _searchOnlyRegularMsgs{true};
 
     inline Qt::CaseSensitivity caseSensitive() const { return _caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive; }
 
     inline bool checkType(Message::Type type) const { return type & (Message::Plain | Message::Notice | Message::Action); }
 
     void checkMessagesForHighlight(int start = 0, int end = -1);
-    void highlightLine(ChatLine *line);
-    void updateHighlights(ChatLine *line);
+    void highlightLine(ChatLine* line);
+    void updateHighlights(ChatLine* line);
 };
 
-
 // Highlight Items
-#include <QGraphicsItem>
-
 class SearchHighlightItem : public QObject, public QGraphicsItem
 {
     Q_OBJECT
-#if QT_VERSION >= 0x040600
     Q_INTERFACES(QGraphicsItem)
-#endif
 
-public :
-        SearchHighlightItem(QRectF wordRect, QGraphicsItem *parent = 0);
-    virtual inline QRectF boundingRect() const { return _boundingRect; }
+public:
+    SearchHighlightItem(QRectF wordRect, QGraphicsItem* parent = nullptr);
+    inline QRectF boundingRect() const override { return _boundingRect; }
     void updateGeometry(qreal width, qreal height);
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-    enum { Type = ChatScene::SearchHighlightType };
-    virtual inline int type() const { return Type; }
+    void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
+    enum
+    {
+        Type = ChatScene::SearchHighlightType
+    };
+    inline int type() const override { return Type; }
 
     void setHighlighted(bool highlighted);
 
-    static bool firstInLine(QGraphicsItem *item1, QGraphicsItem *item2);
+    static bool firstInLine(QGraphicsItem* item1, QGraphicsItem* item2);
 
 private slots:
     void updateHighlight(qreal value);
@@ -118,5 +116,4 @@ private:
     QTimeLine _timeLine;
 };
 
-
-#endif //CHATVIEWSEARCHCONTROLLER_H
+#endif  // CHATVIEWSEARCHCONTROLLER_H