X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebufferviewmanager.cpp;h=96ebc6a80b8744dede839ceaa9ed9efae6410289;hp=23417c3bf7a10afe997d4f6821a551ae049c0cb3;hb=55ed2b3b4fac69d7d4bcb62f312b1fd233626577;hpb=83662b607de9eb742fe9de4dd9445914a6bd9456 diff --git a/src/core/corebufferviewmanager.cpp b/src/core/corebufferviewmanager.cpp index 23417c3b..96ebc6a8 100644 --- 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-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,20 +20,18 @@ #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); @@ -41,7 +39,6 @@ CoreBufferViewManager::CoreBufferViewManager(SignalProxy *proxy, CoreSession *pa } } - void CoreBufferViewManager::saveBufferViews() { QVariantMap views; @@ -56,8 +53,7 @@ void CoreBufferViewManager::saveBufferViews() 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; @@ -74,12 +70,10 @@ void CoreBufferViewManager::requestCreateBufferView(const QVariantMap &propertie } 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(); @@ -89,16 +83,14 @@ void CoreBufferViewManager::requestCreateBufferViews(const QVariantList &propert } } - 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()); } }