X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchcontroller.h;h=ce2c49f26514f69e4c7bfd6944fa73887a8b8497;hp=d2a9dd8e5d0d700fca891951da2e5c785eacd214;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf

diff --git a/src/qtui/chatviewsearchcontroller.h b/src/qtui/chatviewsearchcontroller.h
index d2a9dd8e..ce2c49f2 100644
--- a/src/qtui/chatviewsearchcontroller.h
+++ b/src/qtui/chatviewsearchcontroller.h
@@ -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; }
 
@@ -90,19 +90,15 @@ private:
 class SearchHighlightItem : public QObject, public QGraphicsItem
 {
     Q_OBJECT
-
-// Apparently, there are broken Qt 4.8.2 mocs around that will fail without this (otherwise useless) #if... looking at you, Wheezy!
-#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);