projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use auto where the type is clear from context
[quassel.git]
/
src
/
qtui
/
chatviewsearchcontroller.cpp
diff --git
a/src/qtui/chatviewsearchcontroller.cpp
b/src/qtui/chatviewsearchcontroller.cpp
index
7bae02f
..
2360913
100644
(file)
--- a/
src/qtui/chatviewsearchcontroller.cpp
+++ b/
src/qtui/chatviewsearchcontroller.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
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 *
@@
-30,13
+30,7
@@
#include "messagemodel.h"
ChatViewSearchController::ChatViewSearchController(QObject *parent)
#include "messagemodel.h"
ChatViewSearchController::ChatViewSearchController(QObject *parent)
- : QObject(parent),
- _scene(0),
- _currentHighlight(0),
- _caseSensitive(false),
- _searchSenders(false),
- _searchMsgs(true),
- _searchOnlyRegularMsgs(true)
+ : QObject(parent)
{
}
{
}
@@
-65,8
+59,8
@@
void ChatViewSearchController::setScene(ChatScene *scene)
return;
if (_scene) {
return;
if (_scene) {
- disconnect(_scene,
0, this, 0
);
- disconnect(Client::messageModel(),
0, this, 0
);
+ disconnect(_scene,
nullptr, this, nullptr
);
+ disconnect(Client::messageModel(),
nullptr, this, nullptr
);
qDeleteAll(_highlightItems);
_highlightItems.clear();
}
qDeleteAll(_highlightItems);
_highlightItems.clear();
}
@@
-124,7
+118,7
@@
void ChatViewSearchController::updateHighlights(bool reuse)
if (reuse) {
QSet<ChatLine *> chatLines;
foreach(SearchHighlightItem *highlightItem, _highlightItems) {
if (reuse) {
QSet<ChatLine *> chatLines;
foreach(SearchHighlightItem *highlightItem, _highlightItems) {
-
ChatLine
*line = qgraphicsitem_cast<ChatLine *>(highlightItem->parentItem());
+
auto
*line = qgraphicsitem_cast<ChatLine *>(highlightItem->parentItem());
if (line)
chatLines << line;
}
if (line)
chatLines << line;
}
@@
-265,7
+259,7
@@
void ChatViewSearchController::updateHighlights(ChatLine *line)
}
foreach(QGraphicsItem *child, line->childItems()) {
}
foreach(QGraphicsItem *child, line->childItems()) {
-
SearchHighlightItem
*highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
+
auto
*highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
if (!highlightItem)
continue;
if (!highlightItem)
continue;
@@
-310,7
+304,7
@@
void ChatViewSearchController::repositionHighlights()
{
QSet<ChatLine *> chatLines;
foreach(SearchHighlightItem *item, _highlightItems) {
{
QSet<ChatLine *> chatLines;
foreach(SearchHighlightItem *item, _highlightItems) {
-
ChatLine
*line = qgraphicsitem_cast<ChatLine *>(item->parentItem());
+
auto
*line = qgraphicsitem_cast<ChatLine *>(item->parentItem());
if (line)
chatLines << line;
}
if (line)
chatLines << line;
}
@@
-325,7
+319,7
@@
void ChatViewSearchController::repositionHighlights(ChatLine *line)
{
QList<SearchHighlightItem *> searchHighlights;
foreach(QGraphicsItem *child, line->childItems()) {
{
QList<SearchHighlightItem *> searchHighlights;
foreach(QGraphicsItem *child, line->childItems()) {
-
SearchHighlightItem
*highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
+
auto
*highlightItem = qgraphicsitem_cast<SearchHighlightItem *>(child);
if (highlightItem)
searchHighlights << highlightItem;
}
if (highlightItem)
searchHighlights << highlightItem;
}
@@
-357,7
+351,7
@@
void ChatViewSearchController::repositionHighlights(ChatLine *line)
void ChatViewSearchController::sceneDestroyed()
{
// WARNING: don't call any methods on scene!
void ChatViewSearchController::sceneDestroyed()
{
// WARNING: don't call any methods on scene!
- _scene =
0
;
+ _scene =
nullptr
;
// the items will be automatically deleted when the scene is destroyed
// so we just have to clear the list;
_highlightItems.clear();
// the items will be automatically deleted when the scene is destroyed
// so we just have to clear the list;
_highlightItems.clear();