projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Prefer default member init over ctor init
[quassel.git]
/
src
/
qtui
/
chatviewsearchcontroller.h
diff --git
a/src/qtui/chatviewsearchcontroller.h
b/src/qtui/chatviewsearchcontroller.h
index
fc67a76
..
8e9c8d6
100644
(file)
--- a/
src/qtui/chatviewsearchcontroller.h
+++ b/
src/qtui/chatviewsearchcontroller.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
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 *
@@
-21,7
+21,7
@@
#ifndef CHATVIEWSEARCHCONTROLLER_H
#define CHATVIEWSEARCHCONTROLLER_H
#ifndef CHATVIEWSEARCHCONTROLLER_H
#define CHATVIEWSEARCHCONTROLLER_H
-#include <Q
Object
>
+#include <Q
GraphicsItem
>
#include <QHash>
#include <QPointer>
#include <QString>
#include <QHash>
#include <QPointer>
#include <QString>
@@
-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; }
@@
-67,14
+67,14
@@
signals:
private:
QString _searchString;
private:
QString _searchString;
- ChatScene *_scene;
+ ChatScene *_scene
{nullptr}
;
QList<SearchHighlightItem *> _highlightItems;
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; }
inline Qt::CaseSensitivity caseSensitive() const { return _caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive; }
@@
-87,22
+87,18
@@
private:
// Highlight Items
// Highlight Items
-#include <QGraphicsItem>
-
class SearchHighlightItem : public QObject, public QGraphicsItem
{
Q_OBJECT
class SearchHighlightItem : public QObject, public QGraphicsItem
{
Q_OBJECT
-#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);