projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply suggestions from code review
[quassel.git]
/
src
/
client
/
bufferviewoverlay.cpp
diff --git
a/src/client/bufferviewoverlay.cpp
b/src/client/bufferviewoverlay.cpp
index
91cad71
..
5accc20
100644
(file)
--- a/
src/client/bufferviewoverlay.cpp
+++ b/
src/client/bufferviewoverlay.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
15
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-27,18
+27,13
@@
#include "clientbacklogmanager.h"
#include "clientbufferviewmanager.h"
#include "networkmodel.h"
#include "clientbacklogmanager.h"
#include "clientbufferviewmanager.h"
#include "networkmodel.h"
+#include "util.h"
const int BufferViewOverlay::_updateEventId = QEvent::registerEventType();
const int BufferViewOverlay::_updateEventId = QEvent::registerEventType();
-BufferViewOverlay::BufferViewOverlay(QObject *parent)
- : QObject(parent),
- _aboutToUpdate(false),
- _uninitializedViewCount(0),
- _allowedBufferTypes(0),
- _minimumActivity(0)
-{
-}
-
+BufferViewOverlay::BufferViewOverlay(QObject* parent)
+ : QObject(parent)
+{}
void BufferViewOverlay::reset()
{
void BufferViewOverlay::reset()
{
@@
-56,13
+51,11
@@
void BufferViewOverlay::reset()
_tempRemovedBuffers.clear();
}
_tempRemovedBuffers.clear();
}
-
void BufferViewOverlay::save()
{
CoreAccountSettings().setBufferViewOverlay(_bufferViewIds);
}
void BufferViewOverlay::save()
{
CoreAccountSettings().setBufferViewOverlay(_bufferViewIds);
}
-
void BufferViewOverlay::restore()
{
QSet<int> currentIds = _bufferViewIds;
void BufferViewOverlay::restore()
{
QSet<int> currentIds = _bufferViewIds;
@@
-75,13
+68,12
@@
void BufferViewOverlay::restore()
}
}
}
}
-
void BufferViewOverlay::addView(int viewId)
{
if (_bufferViewIds.contains(viewId))
return;
void BufferViewOverlay::addView(int viewId)
{
if (_bufferViewIds.contains(viewId))
return;
- BufferViewConfig
*
config = Client::bufferViewManager()->bufferViewConfig(viewId);
+ BufferViewConfig
*
config = Client::bufferViewManager()->bufferViewConfig(viewId);
if (!config) {
qDebug() << "BufferViewOverlay::addView(): no such buffer view:" << viewId;
return;
if (!config) {
qDebug() << "BufferViewOverlay::addView(): no such buffer view:" << viewId;
return;
@@
-97,40
+89,38
@@
void BufferViewOverlay::addView(int viewId)
if (wasInitialized) {
BufferIdList buffers;
if (config->networkId().isValid()) {
if (wasInitialized) {
BufferIdList buffers;
if (config->networkId().isValid()) {
- foreach(BufferId bufferId, config->bufferList()) {
+ foreach
(BufferId bufferId, config->bufferList()) {
if (Client::networkModel()->networkId(bufferId) == config->networkId())
buffers << bufferId;
}
if (Client::networkModel()->networkId(bufferId) == config->networkId())
buffers << bufferId;
}
- for
each(BufferId bufferId, config->temporarilyRemovedBuffers().toList
()) {
+ for
(BufferId bufferId : config->temporarilyRemovedBuffers
()) {
if (Client::networkModel()->networkId(bufferId) == config->networkId())
buffers << bufferId;
}
}
else {
if (Client::networkModel()->networkId(bufferId) == config->networkId())
buffers << bufferId;
}
}
else {
- buffers =
BufferIdList::fromSet(config->bufferList().toSet() + config->temporarilyRemovedBuffers()
);
+ buffers =
(toQSet(config->bufferList()) + config->temporarilyRemovedBuffers()).values(
);
}
Client::backlogManager()->checkForBacklog(buffers);
}
}
else {
}
Client::backlogManager()->checkForBacklog(buffers);
}
}
else {
- disconnect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()));
// we use a queued connection here since manipulating the connection list of a sending object
// doesn't seem to be such a good idea while executing a connected slots.
// we use a queued connection here since manipulating the connection list of a sending object
// doesn't seem to be such a good idea while executing a connected slots.
- connect(config,
SIGNAL(initDone()), this, SLOT(viewInitialized()
), Qt::QueuedConnection);
+ connect(config,
&BufferViewConfig::initDone, this, selectOverload<>(&BufferViewOverlay::viewInitialized
), Qt::QueuedConnection);
}
save();
}
}
save();
}
-
void BufferViewOverlay::removeView(int viewId)
{
if (!_bufferViewIds.contains(viewId))
return;
_bufferViewIds.remove(viewId);
void BufferViewOverlay::removeView(int viewId)
{
if (!_bufferViewIds.contains(viewId))
return;
_bufferViewIds.remove(viewId);
- BufferViewConfig
*
config = Client::bufferViewManager()->bufferViewConfig(viewId);
+ BufferViewConfig
*
config = Client::bufferViewManager()->bufferViewConfig(viewId);
if (config)
if (config)
- disconnect(config,
0, this, 0
);
+ disconnect(config,
nullptr, this, nullptr
);
// update initialized State:
bool wasInitialized = isInitialized();
// update initialized State:
bool wasInitialized = isInitialized();
@@
-154,16
+144,13
@@
void BufferViewOverlay::removeView(int viewId)
save();
}
save();
}
-
-void BufferViewOverlay::viewInitialized(BufferViewConfig *config)
+void BufferViewOverlay::viewInitialized(BufferViewConfig* config)
{
if (!config) {
qWarning() << "BufferViewOverlay::viewInitialized() received invalid view!";
return;
}
{
if (!config) {
qWarning() << "BufferViewOverlay::viewInitialized() received invalid view!";
return;
}
- disconnect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()));
-
- connect(config, SIGNAL(configChanged()), this, SLOT(update()));
+ connect(config, &BufferViewConfig::configChanged, this, &BufferViewOverlay::update);
// check if the view was removed in the meantime...
if (_bufferViewIds.contains(config->bufferViewId()))
// check if the view was removed in the meantime...
if (_bufferViewIds.contains(config->bufferViewId()))
@@
-174,16
+161,14
@@
void BufferViewOverlay::viewInitialized(BufferViewConfig *config)
emit initDone();
}
emit initDone();
}
-
void BufferViewOverlay::viewInitialized()
{
void BufferViewOverlay::viewInitialized()
{
-
BufferViewConfig *config = qobject_cast<BufferViewConfig
*>(sender());
+
auto* config = qobject_cast<BufferViewConfig
*>(sender());
Q_ASSERT(config);
viewInitialized(config);
}
Q_ASSERT(config);
viewInitialized(config);
}
-
void BufferViewOverlay::update()
{
if (_aboutToUpdate) {
void BufferViewOverlay::update()
{
if (_aboutToUpdate) {
@@
-193,7
+178,6
@@
void BufferViewOverlay::update()
QCoreApplication::postEvent(this, new QEvent((QEvent::Type)_updateEventId));
}
QCoreApplication::postEvent(this, new QEvent((QEvent::Type)_updateEventId));
}
-
void BufferViewOverlay::updateHelper()
{
if (!_aboutToUpdate)
void BufferViewOverlay::updateHelper()
{
if (!_aboutToUpdate)
@@
-209,7
+193,7
@@
void BufferViewOverlay::updateHelper()
QSet<BufferId> tempRemovedBuffers;
if (Client::bufferViewManager()) {
QSet<BufferId> tempRemovedBuffers;
if (Client::bufferViewManager()) {
- BufferViewConfig
*config = 0
;
+ BufferViewConfig
* config = nullptr
;
QSet<int>::const_iterator viewIter;
for (viewIter = _bufferViewIds.constBegin(); viewIter != _bufferViewIds.constEnd(); ++viewIter) {
config = Client::bufferViewManager()->bufferViewConfig(*viewIter);
QSet<int>::const_iterator viewIter;
for (viewIter = _bufferViewIds.constBegin(); viewIter != _bufferViewIds.constEnd(); ++viewIter) {
config = Client::bufferViewManager()->bufferViewConfig(*viewIter);
@@
-224,12
+208,12
@@
void BufferViewOverlay::updateHelper()
// we have to apply several filters before we can add a buffer to a category (visible, removed, ...)
buffers += filterBuffersByConfig(config->bufferList(), config);
// we have to apply several filters before we can add a buffer to a category (visible, removed, ...)
buffers += filterBuffersByConfig(config->bufferList(), config);
- tempRemovedBuffers += filterBuffersByConfig(config->temporarilyRemovedBuffers().
toList
(), config);
+ tempRemovedBuffers += filterBuffersByConfig(config->temporarilyRemovedBuffers().
values
(), config);
removedBuffers += config->removedBuffers();
}
// prune the sets from overlap
removedBuffers += config->removedBuffers();
}
// prune the sets from overlap
- QSet<BufferId> availableBuffers =
Client::networkModel()->allBufferIds().toSet(
);
+ QSet<BufferId> availableBuffers =
toQSet(Client::networkModel()->allBufferIds()
);
buffers.intersect(availableBuffers);
buffers.intersect(availableBuffers);
@@
-261,14
+245,13
@@
void BufferViewOverlay::updateHelper()
emit hasChanged();
}
emit hasChanged();
}
-
-QSet<BufferId> BufferViewOverlay::filterBuffersByConfig(const QList<BufferId> &buffers, const BufferViewConfig *config)
+QSet<BufferId> BufferViewOverlay::filterBuffersByConfig(const QList<BufferId>& buffers, const BufferViewConfig* config)
{
Q_ASSERT(config);
QSet<BufferId> bufferIds;
BufferInfo bufferInfo;
{
Q_ASSERT(config);
QSet<BufferId> bufferIds;
BufferInfo bufferInfo;
- foreach(BufferId bufferId, buffers) {
+ foreach
(BufferId bufferId, buffers) {
bufferInfo = Client::networkModel()->bufferInfo(bufferId);
if (!(bufferInfo.type() & config->allowedBufferTypes()))
continue;
bufferInfo = Client::networkModel()->bufferInfo(bufferId);
if (!(bufferInfo.type() & config->allowedBufferTypes()))
continue;
@@
-280,57
+263,49
@@
QSet<BufferId> BufferViewOverlay::filterBuffersByConfig(const QList<BufferId> &b
return bufferIds;
}
return bufferIds;
}
-
-void BufferViewOverlay::customEvent(QEvent *event)
+void BufferViewOverlay::customEvent(QEvent* event)
{
if (event->type() == _updateEventId) {
updateHelper();
}
}
{
if (event->type() == _updateEventId) {
updateHelper();
}
}
-
bool BufferViewOverlay::allNetworks()
{
updateHelper();
return _networkIds.contains(NetworkId());
}
bool BufferViewOverlay::allNetworks()
{
updateHelper();
return _networkIds.contains(NetworkId());
}
-
-const QSet<NetworkId> &BufferViewOverlay::networkIds()
+const QSet<NetworkId>& BufferViewOverlay::networkIds()
{
updateHelper();
return _networkIds;
}
{
updateHelper();
return _networkIds;
}
-
-const QSet<BufferId> &BufferViewOverlay::bufferIds()
+const QSet<BufferId>& BufferViewOverlay::bufferIds()
{
updateHelper();
return _buffers;
}
{
updateHelper();
return _buffers;
}
-
-const QSet<BufferId> &BufferViewOverlay::removedBufferIds()
+const QSet<BufferId>& BufferViewOverlay::removedBufferIds()
{
updateHelper();
return _removedBuffers;
}
{
updateHelper();
return _removedBuffers;
}
-
-const QSet<BufferId> &BufferViewOverlay::tempRemovedBufferIds()
+const QSet<BufferId>& BufferViewOverlay::tempRemovedBufferIds()
{
updateHelper();
return _tempRemovedBuffers;
}
{
updateHelper();
return _tempRemovedBuffers;
}
-
int BufferViewOverlay::allowedBufferTypes()
{
updateHelper();
return _allowedBufferTypes;
}
int BufferViewOverlay::allowedBufferTypes()
{
updateHelper();
return _allowedBufferTypes;
}
-
int BufferViewOverlay::minimumActivity()
{
updateHelper();
int BufferViewOverlay::minimumActivity()
{
updateHelper();