projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
funchelpers: Support traits for non-member functions
[quassel.git]
/
src
/
common
/
bufferviewmanager.cpp
diff --git
a/src/common/bufferviewmanager.cpp
b/src/common/bufferviewmanager.cpp
index
2287dda
..
89ba596
100644
(file)
--- a/
src/common/bufferviewmanager.cpp
+++ b/
src/common/bufferviewmanager.cpp
@@
-23,15
+23,14
@@
#include "bufferviewconfig.h"
#include "signalproxy.h"
#include "bufferviewconfig.h"
#include "signalproxy.h"
-BufferViewManager::BufferViewManager(SignalProxy
*proxy, QObject *
parent)
- : SyncableObject(parent)
,
- _proxy(proxy)
+BufferViewManager::BufferViewManager(SignalProxy
* proxy, QObject*
parent)
+ : SyncableObject(parent)
+
,
_proxy(proxy)
{
_proxy->synchronize(this);
}
{
_proxy->synchronize(this);
}
-
-BufferViewConfig *BufferViewManager::bufferViewConfig(int bufferViewId) const
+BufferViewConfig* BufferViewManager::bufferViewConfig(int bufferViewId) const
{
if (_bufferViewConfigs.contains(bufferViewId))
return _bufferViewConfigs[bufferViewId];
{
if (_bufferViewConfigs.contains(bufferViewId))
return _bufferViewConfigs[bufferViewId];
@@
-39,13
+38,11
@@
BufferViewConfig *BufferViewManager::bufferViewConfig(int bufferViewId) const
return nullptr;
}
return nullptr;
}
-
-BufferViewConfig *BufferViewManager::bufferViewConfigFactory(int bufferViewConfigId)
+BufferViewConfig* BufferViewManager::bufferViewConfigFactory(int bufferViewConfigId)
{
return new BufferViewConfig(bufferViewConfigId, this);
}
{
return new BufferViewConfig(bufferViewConfigId, this);
}
-
void BufferViewManager::addBufferViewConfig(int bufferViewConfigId)
{
if (_bufferViewConfigs.contains(bufferViewConfigId)) {
void BufferViewManager::addBufferViewConfig(int bufferViewConfigId)
{
if (_bufferViewConfigs.contains(bufferViewConfigId)) {
@@
-55,8
+52,7
@@
void BufferViewManager::addBufferViewConfig(int bufferViewConfigId)
addBufferViewConfig(bufferViewConfigFactory(bufferViewConfigId));
}
addBufferViewConfig(bufferViewConfigFactory(bufferViewConfigId));
}
-
-void BufferViewManager::addBufferViewConfig(BufferViewConfig *config)
+void BufferViewManager::addBufferViewConfig(BufferViewConfig* config)
{
if (_bufferViewConfigs.contains(config->bufferViewId())) {
delete config;
{
if (_bufferViewConfigs.contains(config->bufferViewId())) {
delete config;
@@
-70,7
+66,6
@@
void BufferViewManager::addBufferViewConfig(BufferViewConfig *config)
emit bufferViewConfigAdded(bufferViewId);
}
emit bufferViewConfigAdded(bufferViewId);
}
-
void BufferViewManager::deleteBufferViewConfig(int bufferViewConfigId)
{
if (!_bufferViewConfigs.contains(bufferViewConfigId))
void BufferViewManager::deleteBufferViewConfig(int bufferViewConfigId)
{
if (!_bufferViewConfigs.contains(bufferViewConfigId))
@@
-82,7
+77,6
@@
void BufferViewManager::deleteBufferViewConfig(int bufferViewConfigId)
emit bufferViewConfigDeleted(bufferViewConfigId);
}
emit bufferViewConfigDeleted(bufferViewConfigId);
}
-
QVariantList BufferViewManager::initBufferViewIds() const
{
QVariantList bufferViewIds;
QVariantList BufferViewManager::initBufferViewIds() const
{
QVariantList bufferViewIds;
@@
-95,10
+89,9
@@
QVariantList BufferViewManager::initBufferViewIds() const
return bufferViewIds;
}
return bufferViewIds;
}
-
void BufferViewManager::initSetBufferViewIds(const QVariantList bufferViewIds)
{
void BufferViewManager::initSetBufferViewIds(const QVariantList bufferViewIds)
{
- for (auto
&&
id : bufferViewIds) {
+ for (auto
&&
id : bufferViewIds) {
addBufferViewConfig(id.value<int>());
}
}
addBufferViewConfig(id.value<int>());
}
}