X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbufferviewoverlay.cpp;h=20d33f852b8dcd02f74e5b3fd86c3709c4a6c47c;hp=106c7cc1ef9376d5dfdd530b2d96a3b2ed40e12d;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=9d54503555534a2c554f09a33df6afa33d6308ec diff --git a/src/client/bufferviewoverlay.cpp b/src/client/bufferviewoverlay.cpp index 106c7cc1..20d33f85 100644 --- a/src/client/bufferviewoverlay.cpp +++ b/src/client/bufferviewoverlay.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * 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) - : QObject(parent), - _aboutToUpdate(false), - _uninitializedViewCount(0), - _allowedBufferTypes(0), - _minimumActivity(0) + : QObject(parent) { } @@ -70,7 +66,7 @@ void BufferViewOverlay::restore() currentIds += CoreAccountSettings().bufferViewOverlay(); QSet::const_iterator iter; - for (iter = currentIds.constBegin(); iter != currentIds.constEnd(); iter++) { + for (iter = currentIds.constBegin(); iter != currentIds.constEnd(); ++iter) { addView(*iter); } } @@ -130,7 +126,7 @@ void BufferViewOverlay::removeView(int viewId) _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(); @@ -144,7 +140,7 @@ void BufferViewOverlay::removeView(int viewId) else { if (!config->isInitialized()) _uninitializedViewCount++; - viewIter++; + ++viewIter; } } @@ -209,9 +205,9 @@ void BufferViewOverlay::updateHelper() QSet tempRemovedBuffers; if (Client::bufferViewManager()) { - BufferViewConfig *config = 0; + BufferViewConfig *config = nullptr; QSet::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;