X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbufferviewmanager.cpp;h=89ba596f75cfa3928b4efb58d16333c1e85da6bd;hp=bae7fe4b37e361098411f3a467d4256e98c14fa0;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e

diff --git a/src/common/bufferviewmanager.cpp b/src/common/bufferviewmanager.cpp
index bae7fe4b..89ba596f 100644
--- a/src/common/bufferviewmanager.cpp
+++ b/src/common/bufferviewmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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  *
@@ -23,34 +23,41 @@
 #include "bufferviewconfig.h"
 #include "signalproxy.h"
 
-INIT_SYNCABLE_OBJECT(BufferViewManager)
-BufferViewManager::BufferViewManager(SignalProxy *proxy, QObject *parent)
-    : SyncableObject(parent),
-    _proxy(proxy)
+BufferViewManager::BufferViewManager(SignalProxy* proxy, QObject* parent)
+    : SyncableObject(parent)
+    , _proxy(proxy)
 {
     _proxy->synchronize(this);
 }
 
-
-BufferViewConfig *BufferViewManager::bufferViewConfig(int bufferViewId) const
+BufferViewConfig* BufferViewManager::bufferViewConfig(int bufferViewId) const
 {
     if (_bufferViewConfigs.contains(bufferViewId))
         return _bufferViewConfigs[bufferViewId];
     else
-        return 0;
+        return nullptr;
 }
 
-
-BufferViewConfig *BufferViewManager::bufferViewConfigFactory(int bufferViewConfigId)
+BufferViewConfig* BufferViewManager::bufferViewConfigFactory(int bufferViewConfigId)
 {
     return new BufferViewConfig(bufferViewConfigId, this);
 }
 
+void BufferViewManager::addBufferViewConfig(int bufferViewConfigId)
+{
+    if (_bufferViewConfigs.contains(bufferViewConfigId)) {
+        return;
+    }
 
-void BufferViewManager::addBufferViewConfig(BufferViewConfig *config)
+    addBufferViewConfig(bufferViewConfigFactory(bufferViewConfigId));
+}
+
+void BufferViewManager::addBufferViewConfig(BufferViewConfig* config)
 {
-    if (_bufferViewConfigs.contains(config->bufferViewId()))
+    if (_bufferViewConfigs.contains(config->bufferViewId())) {
+        delete config;
         return;
+    }
 
     _proxy->synchronize(config);
     _bufferViewConfigs[config->bufferViewId()] = config;
@@ -59,16 +66,6 @@ void BufferViewManager::addBufferViewConfig(BufferViewConfig *config)
     emit bufferViewConfigAdded(bufferViewId);
 }
 
-
-void BufferViewManager::addBufferViewConfig(int bufferViewConfigId)
-{
-    if (_bufferViewConfigs.contains(bufferViewConfigId))
-        return;
-
-    addBufferViewConfig(bufferViewConfigFactory(bufferViewConfigId));
-}
-
-
 void BufferViewManager::deleteBufferViewConfig(int bufferViewConfigId)
 {
     if (!_bufferViewConfigs.contains(bufferViewConfigId))
@@ -80,7 +77,6 @@ void BufferViewManager::deleteBufferViewConfig(int bufferViewConfigId)
     emit bufferViewConfigDeleted(bufferViewConfigId);
 }
 
-
 QVariantList BufferViewManager::initBufferViewIds() const
 {
     QVariantList bufferViewIds;
@@ -88,18 +84,14 @@ QVariantList BufferViewManager::initBufferViewIds() const
     BufferViewConfigHash::const_iterator iterEnd = _bufferViewConfigs.constEnd();
     while (iter != iterEnd) {
         bufferViewIds << (*iter)->bufferViewId();
-        iter++;
+        ++iter;
     }
     return bufferViewIds;
 }
 
-
 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>());
     }
 }