/***************************************************************************
- * Copyright (C) 2005-08 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 *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "bufferviewoverlay.h"
const int BufferViewOverlay::_updateEventId = QEvent::registerEventType();
BufferViewOverlay::BufferViewOverlay(QObject *parent)
- : QObject(parent),
- _aboutToUpdate(false),
- _uninitializedViewCount(0),
- _allowedBufferTypes(0),
- _minimumActivity(0)
+ : QObject(parent)
{
}
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);
}
}
}
}
else {
- disconnect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()));
// we use a queued connection here since manipulating the connection list of a sending object
// doesn't seem to be such a good idea while executing a connected slots.
- connect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()), Qt::QueuedConnection);
+ connect(config, &BufferViewConfig::initDone, this, selectOverload<>(&BufferViewOverlay::viewInitialized), Qt::QueuedConnection);
}
save();
}
_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();
else {
if (!config->isInitialized())
_uninitializedViewCount++;
- viewIter++;
+ ++viewIter;
}
}
qWarning() << "BufferViewOverlay::viewInitialized() received invalid view!";
return;
}
- disconnect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()));
-
- connect(config, SIGNAL(configChanged()), this, SLOT(update()));
+ connect(config, &BufferViewConfig::configChanged, this, &BufferViewOverlay::update);
// check if the view was removed in the meantime...
if (_bufferViewIds.contains(config->bufferViewId()))
void BufferViewOverlay::viewInitialized()
{
- BufferViewConfig *config = qobject_cast<BufferViewConfig *>(sender());
+ auto *config = qobject_cast<BufferViewConfig *>(sender());
Q_ASSERT(config);
viewInitialized(config);
QSet<BufferId> tempRemovedBuffers;
if (Client::bufferViewManager()) {
- BufferViewConfig *config = 0;
+ BufferViewConfig *config = nullptr;
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;