/***************************************************************************
- * Copyright (C) 2005-2015 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 *
#include "bufferviewconfig.h"
#include "signalproxy.h"
-INIT_SYNCABLE_OBJECT(BufferViewManager)
BufferViewManager::BufferViewManager(SignalProxy *proxy, QObject *parent)
: SyncableObject(parent),
_proxy(proxy)
if (_bufferViewConfigs.contains(bufferViewId))
return _bufferViewConfigs[bufferViewId];
else
- return 0;
+ return nullptr;
}
}
-void BufferViewManager::addBufferViewConfig(BufferViewConfig *config)
+void BufferViewManager::addBufferViewConfig(int bufferViewConfigId)
{
- if (_bufferViewConfigs.contains(config->bufferViewId()))
+ if (_bufferViewConfigs.contains(bufferViewConfigId)) {
return;
+ }
- _proxy->synchronize(config);
- _bufferViewConfigs[config->bufferViewId()] = config;
- int bufferViewId = config->bufferViewId();
- SYNC_OTHER(addBufferViewConfig, ARG(bufferViewId))
- emit bufferViewConfigAdded(bufferViewId);
+ addBufferViewConfig(bufferViewConfigFactory(bufferViewConfigId));
}
-void BufferViewManager::addBufferViewConfig(int bufferViewConfigId)
+void BufferViewManager::addBufferViewConfig(BufferViewConfig *config)
{
- if (_bufferViewConfigs.contains(bufferViewConfigId))
+ if (_bufferViewConfigs.contains(config->bufferViewId())) {
+ delete config;
return;
+ }
- addBufferViewConfig(bufferViewConfigFactory(bufferViewConfigId));
+ _proxy->synchronize(config);
+ _bufferViewConfigs[config->bufferViewId()] = config;
+ int bufferViewId = config->bufferViewId();
+ SYNC_OTHER(addBufferViewConfig, ARG(bufferViewId))
+ emit bufferViewConfigAdded(bufferViewId);
}
void BufferViewManager::initSetBufferViewIds(const QVariantList bufferViewIds)
{
- QVariantList::const_iterator iter = bufferViewIds.constBegin();
- QVariantList::const_iterator iterEnd = bufferViewIds.constEnd();
- while (iter != iterEnd) {
- newBufferViewConfig((*iter).value<int>());
- ++iter;
+ for (auto &&id : bufferViewIds) {
+ addBufferViewConfig(id.value<int>());
}
}