projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use 'using' instead of 'typedef'
[quassel.git]
/
src
/
qtui
/
chatviewsearchcontroller.h
diff --git
a/src/qtui/chatviewsearchcontroller.h
b/src/qtui/chatviewsearchcontroller.h
index
2ad0eda
..
ce2c49f
100644
(file)
--- a/
src/qtui/chatviewsearchcontroller.h
+++ b/
src/qtui/chatviewsearchcontroller.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-39,7
+39,7
@@
class ChatViewSearchController : public QObject
Q_OBJECT
public:
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; }
@@
-90,19
+90,15
@@
private:
class SearchHighlightItem : public QObject, public QGraphicsItem
{
Q_OBJECT
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)
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);
void updateGeometry(qreal width, qreal height);
- v
irtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
;
+ v
oid paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override
;
enum { Type = ChatScene::SearchHighlightType };
enum { Type = ChatScene::SearchHighlightType };
-
virtual inline int type() const
{ return Type; }
+
inline int type() const override
{ return Type; }
void setHighlighted(bool highlighted);
void setHighlighted(bool highlighted);