X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchcontroller.h;h=8e9c8d67f265c034fdb1c2480b39628922d0ead0;hp=fc67a76f98d3a9cc269107fd3196948097825838;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49

diff --git a/src/qtui/chatviewsearchcontroller.h b/src/qtui/chatviewsearchcontroller.h
index fc67a76f..8e9c8d67 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-2018 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,7 +39,7 @@ class ChatViewSearchController : public QObject
     Q_OBJECT
 
 public:
-    ChatViewSearchController(QObject *parent = 0);
+    ChatViewSearchController(QObject *parent = nullptr);
 
     inline const QString &searchString() const { return _searchString; }
 
@@ -67,14 +67,14 @@ signals:
 
 private:
     QString _searchString;
-    ChatScene *_scene;
+    ChatScene *_scene{nullptr};
     QList<SearchHighlightItem *> _highlightItems;
-    int _currentHighlight;
+    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; }
 
@@ -87,22 +87,18 @@ private:
 
 
 // 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);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;
     enum { Type = ChatScene::SearchHighlightType };
-    virtual inline int type() const { return Type; }
+    inline int type() const override { return Type; }
 
     void setHighlighted(bool highlighted);