core: Track upgrade step within schema version

[quassel.git] / src / core / corebufferviewmanager.cpp

diff --git a/src/core/corebufferviewmanager.cpp b/src/core/corebufferviewmanager.cpp
index 2c63d92..8b0176a 100644 (file)
--- a/src/core/corebufferviewmanager.cpp
+++ b/src/core/corebufferviewmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,28 +20,25 @@
 
 #include "corebufferviewmanager.h"
 
-#include "corebufferviewconfig.h"
-
 #include "core.h"
+#include "corebufferviewconfig.h"
 #include "coresession.h"
 
-INIT_SYNCABLE_OBJECT(CoreBufferViewManager)
-CoreBufferViewManager::CoreBufferViewManager(SignalProxy *proxy, CoreSession *parent)
-    : BufferViewManager(proxy, parent),
-    _coreSession(parent)
+CoreBufferViewManager::CoreBufferViewManager(SignalProxy* proxy, CoreSession* parent)
+    : BufferViewManager(proxy, parent)
+    , _coreSession(parent)
 {
     QVariantMap views = Core::getUserSetting(_coreSession->user(), "BufferViews").toMap();
     QVariantMap::iterator iter = views.begin();
     QVariantMap::iterator iterEnd = views.end();
-    CoreBufferViewConfig *config = 0;
+    CoreBufferViewConfig* config = nullptr;
     while (iter != iterEnd) {
         config = new CoreBufferViewConfig(iter.key().toInt(), iter.value().toMap(), this);
         addBufferViewConfig(config);
-        iter++;
+        ++iter;
     }
 }
 
-
 void CoreBufferViewManager::saveBufferViews()
 {
     QVariantMap views;
@@ -50,14 +47,13 @@ void CoreBufferViewManager::saveBufferViews()
     BufferViewConfigHash::const_iterator iterEnd = bufferViewConfigHash().constEnd();
     while (iter != iterEnd) {
         views[QString::number((*iter)->bufferViewId())] = (*iter)->toVariantMap();
-        iter++;
+        ++iter;
     }
 
     Core::setUserSetting(_coreSession->user(), "BufferViews", views);
 }
 
-
-void CoreBufferViewManager::requestCreateBufferView(const QVariantMap &properties)
+void CoreBufferViewManager::requestCreateBufferView(const QVariantMap& properties)
 {
     QString bufferViewName = properties["bufferViewName"].toString();
     int maxId = -1;
@@ -70,35 +66,31 @@ void CoreBufferViewManager::requestCreateBufferView(const QVariantMap &propertie
         if ((*iter)->bufferViewId() > maxId)
             maxId = (*iter)->bufferViewId();
 
-        iter++;
+        ++iter;
     }
     maxId++;
 
-    CoreBufferViewConfig *config = new CoreBufferViewConfig(maxId, properties);
-    addBufferViewConfig(config);
+    addBufferViewConfig(new CoreBufferViewConfig(maxId, properties, this));
 }
 
-
-void CoreBufferViewManager::requestCreateBufferViews(const QVariantList &properties)
+void CoreBufferViewManager::requestCreateBufferViews(const QVariantList& properties)
 {
     QVariantList::const_iterator iter = properties.constBegin();
     QVariantList::const_iterator iterEnd = properties.constEnd();
     while (iter != iterEnd) {
         requestCreateBufferView((*iter).toMap());
-        iter++;
+        ++iter;
     }
 }
 
-
 void CoreBufferViewManager::requestDeleteBufferView(int bufferViewId)
 {
     deleteBufferViewConfig(bufferViewId);
 }
 
-
-void CoreBufferViewManager::requestDeleteBufferViews(const QVariantList &bufferViews)
+void CoreBufferViewManager::requestDeleteBufferViews(const QVariantList& bufferViews)
 {
-    foreach(QVariant bufferView, bufferViews) {
+    foreach (QVariant bufferView, bufferViews) {
         deleteBufferViewConfig(bufferView.toInt());
     }
 }