X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbufferviewconfig.cpp;fp=src%2Fcommon%2Fbufferviewconfig.cpp;h=15750ced5c6d133c4bb0a3df86b6a368dce3ca54;hp=5cae5f8fad44abf7e0c250930769412332b295fb;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d

diff --git a/src/common/bufferviewconfig.cpp b/src/common/bufferviewconfig.cpp
index 5cae5f8f..15750ced 100644
--- a/src/common/bufferviewconfig.cpp
+++ b/src/common/bufferviewconfig.cpp
@@ -24,7 +24,7 @@
 
 INIT_SYNCABLE_OBJECT(BufferViewConfig)
 BufferViewConfig::BufferViewConfig(int bufferViewId, QObject *parent)
-  : SyncableObject(parent),
+    : SyncableObject(parent),
     _bufferViewId(bufferViewId),
     _addNewBuffersAutomatically(true),
     _sortAlphabetically(true),
@@ -33,214 +33,253 @@ BufferViewConfig::BufferViewConfig(int bufferViewId, QObject *parent)
     _allowedBufferTypes(BufferInfo::StatusBuffer | BufferInfo::ChannelBuffer | BufferInfo::QueryBuffer | BufferInfo::GroupBuffer),
     _minimumActivity(0)
 {
-  setObjectName(QString::number(bufferViewId));
+    setObjectName(QString::number(bufferViewId));
 }
 
+
 BufferViewConfig::BufferViewConfig(int bufferViewId, const QVariantMap &properties, QObject *parent)
-  : SyncableObject(parent),
+    : SyncableObject(parent),
     _bufferViewId(bufferViewId)
 {
-  fromVariantMap(properties);
-  setObjectName(QString::number(bufferViewId));
+    fromVariantMap(properties);
+    setObjectName(QString::number(bufferViewId));
 }
 
-void BufferViewConfig::setBufferViewName(const QString &bufferViewName) {
-  if(_bufferViewName == bufferViewName)
-    return;
 
-  _bufferViewName = bufferViewName;
-  SYNC(ARG(bufferViewName))
-  emit bufferViewNameSet(bufferViewName);
+void BufferViewConfig::setBufferViewName(const QString &bufferViewName)
+{
+    if (_bufferViewName == bufferViewName)
+        return;
+
+    _bufferViewName = bufferViewName;
+    SYNC(ARG(bufferViewName))
+    emit bufferViewNameSet(bufferViewName);
 }
 
-void BufferViewConfig::setNetworkId(const NetworkId &networkId) {
-  if(_networkId == networkId)
-    return;
 
-  _networkId = networkId;
-  SYNC(ARG(networkId))
-  emit networkIdSet(networkId);
-  emit configChanged();
+void BufferViewConfig::setNetworkId(const NetworkId &networkId)
+{
+    if (_networkId == networkId)
+        return;
+
+    _networkId = networkId;
+    SYNC(ARG(networkId))
+    emit networkIdSet(networkId);
+    emit configChanged();
 }
 
-void BufferViewConfig::setAddNewBuffersAutomatically(bool addNewBuffersAutomatically) {
-  if(_addNewBuffersAutomatically == addNewBuffersAutomatically)
-    return;
 
-  _addNewBuffersAutomatically = addNewBuffersAutomatically;
-  SYNC(ARG(addNewBuffersAutomatically))
-  emit configChanged();
+void BufferViewConfig::setAddNewBuffersAutomatically(bool addNewBuffersAutomatically)
+{
+    if (_addNewBuffersAutomatically == addNewBuffersAutomatically)
+        return;
+
+    _addNewBuffersAutomatically = addNewBuffersAutomatically;
+    SYNC(ARG(addNewBuffersAutomatically))
+    emit configChanged();
 }
 
-void BufferViewConfig::setSortAlphabetically(bool sortAlphabetically) {
-  if(_sortAlphabetically == sortAlphabetically)
-    return;
 
-  _sortAlphabetically = sortAlphabetically;
-  SYNC(ARG(sortAlphabetically))
-  emit configChanged();
+void BufferViewConfig::setSortAlphabetically(bool sortAlphabetically)
+{
+    if (_sortAlphabetically == sortAlphabetically)
+        return;
+
+    _sortAlphabetically = sortAlphabetically;
+    SYNC(ARG(sortAlphabetically))
+    emit configChanged();
 }
 
-void BufferViewConfig::setDisableDecoration(bool disableDecoration) {
-  if(_disableDecoration == disableDecoration)
-    return;
 
-  _disableDecoration = disableDecoration;
-  SYNC(ARG(disableDecoration))
+void BufferViewConfig::setDisableDecoration(bool disableDecoration)
+{
+    if (_disableDecoration == disableDecoration)
+        return;
+
+    _disableDecoration = disableDecoration;
+    SYNC(ARG(disableDecoration))
 }
 
-void BufferViewConfig::setAllowedBufferTypes(int bufferTypes) {
-  if(_allowedBufferTypes == bufferTypes)
-    return;
 
-  _allowedBufferTypes = bufferTypes;
-  SYNC(ARG(bufferTypes))
-  emit configChanged();
+void BufferViewConfig::setAllowedBufferTypes(int bufferTypes)
+{
+    if (_allowedBufferTypes == bufferTypes)
+        return;
+
+    _allowedBufferTypes = bufferTypes;
+    SYNC(ARG(bufferTypes))
+    emit configChanged();
 }
 
-void BufferViewConfig::setMinimumActivity(int activity) {
-  if(_minimumActivity == activity)
-    return;
 
-  _minimumActivity = activity;
-  SYNC(ARG(activity))
-  emit configChanged();
+void BufferViewConfig::setMinimumActivity(int activity)
+{
+    if (_minimumActivity == activity)
+        return;
+
+    _minimumActivity = activity;
+    SYNC(ARG(activity))
+    emit configChanged();
 }
 
-void BufferViewConfig::setHideInactiveBuffers(bool hideInactiveBuffers) {
-  if(_hideInactiveBuffers == hideInactiveBuffers)
-    return;
 
-  _hideInactiveBuffers = hideInactiveBuffers;
-  SYNC(ARG(hideInactiveBuffers))
-  emit configChanged();
+void BufferViewConfig::setHideInactiveBuffers(bool hideInactiveBuffers)
+{
+    if (_hideInactiveBuffers == hideInactiveBuffers)
+        return;
+
+    _hideInactiveBuffers = hideInactiveBuffers;
+    SYNC(ARG(hideInactiveBuffers))
+    emit configChanged();
 }
 
-QVariantList BufferViewConfig::initBufferList() const {
-  QVariantList buffers;
 
-  foreach(BufferId bufferId, _buffers) {
-    buffers << qVariantFromValue(bufferId);
-  }
+QVariantList BufferViewConfig::initBufferList() const
+{
+    QVariantList buffers;
 
-  return buffers;
+    foreach(BufferId bufferId, _buffers) {
+        buffers << qVariantFromValue(bufferId);
+    }
+
+    return buffers;
 }
 
-void BufferViewConfig::initSetBufferList(const QVariantList &buffers) {
-  _buffers.clear();
 
-  foreach(QVariant buffer, buffers) {
-    _buffers << buffer.value<BufferId>();
-  }
+void BufferViewConfig::initSetBufferList(const QVariantList &buffers)
+{
+    _buffers.clear();
 
-  emit configChanged(); // used to track changes in the settingspage
+    foreach(QVariant buffer, buffers) {
+        _buffers << buffer.value<BufferId>();
+    }
+
+    emit configChanged(); // used to track changes in the settingspage
 }
 
-void BufferViewConfig::initSetBufferList(const QList<BufferId> &buffers) {
-  _buffers.clear();
 
-  foreach(BufferId bufferId, buffers) {
-    _buffers << bufferId;
-  }
+void BufferViewConfig::initSetBufferList(const QList<BufferId> &buffers)
+{
+    _buffers.clear();
+
+    foreach(BufferId bufferId, buffers) {
+        _buffers << bufferId;
+    }
 
-  emit configChanged(); // used to track changes in the settingspage
+    emit configChanged(); // used to track changes in the settingspage
 }
 
-QVariantList BufferViewConfig::initRemovedBuffers() const {
-  QVariantList removedBuffers;
 
-  foreach(BufferId bufferId, _removedBuffers) {
-    removedBuffers << qVariantFromValue(bufferId);
-  }
+QVariantList BufferViewConfig::initRemovedBuffers() const
+{
+    QVariantList removedBuffers;
+
+    foreach(BufferId bufferId, _removedBuffers) {
+        removedBuffers << qVariantFromValue(bufferId);
+    }
 
-  return removedBuffers;
+    return removedBuffers;
 }
 
-void BufferViewConfig::initSetRemovedBuffers(const QVariantList &buffers) {
-  _removedBuffers.clear();
 
-  foreach(QVariant buffer, buffers) {
-    _removedBuffers << buffer.value<BufferId>();
-  }
+void BufferViewConfig::initSetRemovedBuffers(const QVariantList &buffers)
+{
+    _removedBuffers.clear();
+
+    foreach(QVariant buffer, buffers) {
+        _removedBuffers << buffer.value<BufferId>();
+    }
 }
 
-QVariantList BufferViewConfig::initTemporarilyRemovedBuffers() const {
-  QVariantList temporarilyRemovedBuffers;
 
-  foreach(BufferId bufferId, _temporarilyRemovedBuffers) {
-    temporarilyRemovedBuffers << qVariantFromValue(bufferId);
-  }
+QVariantList BufferViewConfig::initTemporarilyRemovedBuffers() const
+{
+    QVariantList temporarilyRemovedBuffers;
 
-  return temporarilyRemovedBuffers;
+    foreach(BufferId bufferId, _temporarilyRemovedBuffers) {
+        temporarilyRemovedBuffers << qVariantFromValue(bufferId);
+    }
+
+    return temporarilyRemovedBuffers;
 }
 
-void BufferViewConfig::initSetTemporarilyRemovedBuffers(const QVariantList &buffers) {
-  _temporarilyRemovedBuffers.clear();
 
-  foreach(QVariant buffer, buffers) {
-    _temporarilyRemovedBuffers << buffer.value<BufferId>();
-  }
+void BufferViewConfig::initSetTemporarilyRemovedBuffers(const QVariantList &buffers)
+{
+    _temporarilyRemovedBuffers.clear();
+
+    foreach(QVariant buffer, buffers) {
+        _temporarilyRemovedBuffers << buffer.value<BufferId>();
+    }
 }
 
-void BufferViewConfig::addBuffer(const BufferId &bufferId, int pos) {
-  if(_buffers.contains(bufferId))
-    return;
 
-  if(pos < 0)
-    pos = 0;
-  if(pos > _buffers.count())
-    pos = _buffers.count();
+void BufferViewConfig::addBuffer(const BufferId &bufferId, int pos)
+{
+    if (_buffers.contains(bufferId))
+        return;
 
-  if(_removedBuffers.contains(bufferId))
-    _removedBuffers.remove(bufferId);
+    if (pos < 0)
+        pos = 0;
+    if (pos > _buffers.count())
+        pos = _buffers.count();
 
-  if(_temporarilyRemovedBuffers.contains(bufferId))
-    _temporarilyRemovedBuffers.remove(bufferId);
+    if (_removedBuffers.contains(bufferId))
+        _removedBuffers.remove(bufferId);
 
-  _buffers.insert(pos, bufferId);
-  SYNC(ARG(bufferId), ARG(pos))
-  emit bufferAdded(bufferId, pos);
-  emit configChanged();
-}
+    if (_temporarilyRemovedBuffers.contains(bufferId))
+        _temporarilyRemovedBuffers.remove(bufferId);
 
-void BufferViewConfig::moveBuffer(const BufferId &bufferId, int pos) {
-  if(!_buffers.contains(bufferId))
-    return;
+    _buffers.insert(pos, bufferId);
+    SYNC(ARG(bufferId), ARG(pos))
+    emit bufferAdded(bufferId, pos);
+    emit configChanged();
+}
 
-  if(pos < 0)
-    pos = 0;
-  if(pos >= _buffers.count())
-    pos = _buffers.count() - 1;
 
-  _buffers.move(_buffers.indexOf(bufferId), pos);
-  SYNC(ARG(bufferId), ARG(pos))
-  emit bufferMoved(bufferId, pos);
-  emit configChanged();
+void BufferViewConfig::moveBuffer(const BufferId &bufferId, int pos)
+{
+    if (!_buffers.contains(bufferId))
+        return;
+
+    if (pos < 0)
+        pos = 0;
+    if (pos >= _buffers.count())
+        pos = _buffers.count() - 1;
+
+    _buffers.move(_buffers.indexOf(bufferId), pos);
+    SYNC(ARG(bufferId), ARG(pos))
+    emit bufferMoved(bufferId, pos);
+    emit configChanged();
 }
 
-void BufferViewConfig::removeBuffer(const BufferId &bufferId) {
-  if(_buffers.contains(bufferId))
-    _buffers.removeAt(_buffers.indexOf(bufferId));
 
-  if(_removedBuffers.contains(bufferId))
-    _removedBuffers.remove(bufferId);
+void BufferViewConfig::removeBuffer(const BufferId &bufferId)
+{
+    if (_buffers.contains(bufferId))
+        _buffers.removeAt(_buffers.indexOf(bufferId));
+
+    if (_removedBuffers.contains(bufferId))
+        _removedBuffers.remove(bufferId);
 
-  _temporarilyRemovedBuffers << bufferId;
-  SYNC(ARG(bufferId))
-  emit bufferRemoved(bufferId);
-  emit configChanged();
+    _temporarilyRemovedBuffers << bufferId;
+    SYNC(ARG(bufferId))
+    emit bufferRemoved(bufferId);
+    emit configChanged();
 }
 
-void BufferViewConfig::removeBufferPermanently(const BufferId &bufferId) {
-  if(_buffers.contains(bufferId))
-    _buffers.removeAt(_buffers.indexOf(bufferId));
 
-  if(_temporarilyRemovedBuffers.contains(bufferId))
-    _temporarilyRemovedBuffers.remove(bufferId);
+void BufferViewConfig::removeBufferPermanently(const BufferId &bufferId)
+{
+    if (_buffers.contains(bufferId))
+        _buffers.removeAt(_buffers.indexOf(bufferId));
+
+    if (_temporarilyRemovedBuffers.contains(bufferId))
+        _temporarilyRemovedBuffers.remove(bufferId);
 
-  _removedBuffers << bufferId;
+    _removedBuffers << bufferId;
 
-  SYNC(ARG(bufferId))
-  emit bufferPermanentlyRemoved(bufferId);
-  emit configChanged();
+    SYNC(ARG(bufferId))
+    emit bufferPermanentlyRemoved(bufferId);
+    emit configChanged();
 }