projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use 'while(true)' instead of 'while(1)'
[quassel.git]
/
src
/
client
/
bufferviewoverlay.cpp
diff --git
a/src/client/bufferviewoverlay.cpp
b/src/client/bufferviewoverlay.cpp
index
8356022
..
8e802fd
100644
(file)
--- a/
src/client/bufferviewoverlay.cpp
+++ b/
src/client/bufferviewoverlay.cpp
@@
-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 *
@@
-31,11
+31,7
@@
const int BufferViewOverlay::_updateEventId = QEvent::registerEventType();
BufferViewOverlay::BufferViewOverlay(QObject *parent)
const int BufferViewOverlay::_updateEventId = QEvent::registerEventType();
BufferViewOverlay::BufferViewOverlay(QObject *parent)
- : QObject(parent),
- _aboutToUpdate(false),
- _uninitializedViewCount(0),
- _allowedBufferTypes(0),
- _minimumActivity(0)
+ : QObject(parent)
{
}
{
}
@@
-70,7
+66,7
@@
void BufferViewOverlay::restore()
currentIds += CoreAccountSettings().bufferViewOverlay();
QSet<int>::const_iterator iter;
currentIds += CoreAccountSettings().bufferViewOverlay();
QSet<int>::const_iterator iter;
- for (iter = currentIds.constBegin(); iter != currentIds.constEnd();
iter++
) {
+ for (iter = currentIds.constBegin(); iter != currentIds.constEnd();
++iter
) {
addView(*iter);
}
}
addView(*iter);
}
}
@@
-130,7
+126,7
@@
void BufferViewOverlay::removeView(int viewId)
_bufferViewIds.remove(viewId);
BufferViewConfig *config = Client::bufferViewManager()->bufferViewConfig(viewId);
if (config)
_bufferViewIds.remove(viewId);
BufferViewConfig *config = Client::bufferViewManager()->bufferViewConfig(viewId);
if (config)
- disconnect(config,
0, this, 0
);
+ disconnect(config,
nullptr, this, nullptr
);
// update initialized State:
bool wasInitialized = isInitialized();
// update initialized State:
bool wasInitialized = isInitialized();
@@
-144,7
+140,7
@@
void BufferViewOverlay::removeView(int viewId)
else {
if (!config->isInitialized())
_uninitializedViewCount++;
else {
if (!config->isInitialized())
_uninitializedViewCount++;
-
viewIter++
;
+
++viewIter
;
}
}
}
}
@@
-177,7
+173,7
@@
void BufferViewOverlay::viewInitialized(BufferViewConfig *config)
void BufferViewOverlay::viewInitialized()
{
void BufferViewOverlay::viewInitialized()
{
-
BufferViewConfig
*config = qobject_cast<BufferViewConfig *>(sender());
+
auto
*config = qobject_cast<BufferViewConfig *>(sender());
Q_ASSERT(config);
viewInitialized(config);
Q_ASSERT(config);
viewInitialized(config);
@@
-209,9
+205,9
@@
void BufferViewOverlay::updateHelper()
QSet<BufferId> tempRemovedBuffers;
if (Client::bufferViewManager()) {
QSet<BufferId> tempRemovedBuffers;
if (Client::bufferViewManager()) {
- BufferViewConfig *config =
0
;
+ BufferViewConfig *config =
nullptr
;
QSet<int>::const_iterator viewIter;
QSet<int>::const_iterator viewIter;
- for (viewIter = _bufferViewIds.constBegin(); viewIter != _bufferViewIds.constEnd();
viewIter++
) {
+ for (viewIter = _bufferViewIds.constBegin(); viewIter != _bufferViewIds.constEnd();
++viewIter
) {
config = Client::bufferViewManager()->bufferViewConfig(*viewIter);
if (!config)
continue;
config = Client::bufferViewManager()->bufferViewConfig(*viewIter);
if (!config)
continue;