projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make clearing flags more explicit
[quassel.git]
/
src
/
common
/
buffersyncer.h
diff --git
a/src/common/buffersyncer.h
b/src/common/buffersyncer.h
index
0805e34
..
34d59c1
100644
(file)
--- a/
src/common/buffersyncer.h
+++ b/
src/common/buffersyncer.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-
09 by the Quassel Project
*
+ * Copyright (C) 2005-
2016 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 *
@@
-15,7
+15,7
@@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 5
9 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
+ * 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#ifndef BUFFERSYNCER_H_
***************************************************************************/
#ifndef BUFFERSYNCER_H_
@@
-23,6
+23,7
@@
#include "syncableobject.h"
#include "types.h"
#include "syncableobject.h"
#include "types.h"
+#include "message.h"
class BufferSyncer : public SyncableObject
{
class BufferSyncer : public SyncableObject
{
@@
-31,12
+32,19
@@
class BufferSyncer : public SyncableObject
public:
explicit BufferSyncer(QObject *parent);
public:
explicit BufferSyncer(QObject *parent);
- explicit BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, const QHash<BufferId, MsgId> &markerLines, QObject *parent);
+ explicit BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, const QHash<BufferId, MsgId> &markerLines,
const QHash<BufferId, Message::Types> &activities,
QObject *parent);
inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
MsgId lastSeenMsg(BufferId buffer) const;
MsgId markerLine(BufferId buffer) const;
inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
MsgId lastSeenMsg(BufferId buffer) const;
MsgId markerLine(BufferId buffer) const;
+ Message::Types activity(BufferId buffer) const;
+
+ void markActivitiesChanged() {
+ for (auto buffer : _bufferActivities.keys()) {
+ emit bufferActivityChanged(buffer, activity(buffer));
+ }
+ }
public slots:
QVariantList initLastSeenMsg() const;
public slots:
QVariantList initLastSeenMsg() const;
@@
-45,9
+53,19
@@
public slots:
QVariantList initMarkerLines() const;
void initSetMarkerLines(const QVariantList &);
QVariantList initMarkerLines() const;
void initSetMarkerLines(const QVariantList &);
+ QVariantList initActivities() const;
+ void initSetActivities(const QVariantList &);
+
virtual inline void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) }
virtual inline void requestSetMarkerLine(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) setMarkerLine(buffer, msgId); }
virtual inline void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) }
virtual inline void requestSetMarkerLine(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) setMarkerLine(buffer, msgId); }
+ virtual inline void setBufferActivity(BufferId buffer, int activity) {
+ auto flags = Message::Types(activity);
+ SYNC(ARG(buffer), ARG(activity));
+ _bufferActivities[buffer] = flags;
+ emit bufferActivityChanged(buffer, flags);
+ }
+
virtual inline void requestRemoveBuffer(BufferId buffer) { REQUEST(ARG(buffer)) }
virtual void removeBuffer(BufferId buffer);
virtual inline void requestRemoveBuffer(BufferId buffer) { REQUEST(ARG(buffer)) }
virtual void removeBuffer(BufferId buffer);
@@
-69,6
+87,7
@@
signals:
void bufferRenamed(BufferId buffer, QString newName);
void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
void bufferMarkedAsRead(BufferId buffer);
void bufferRenamed(BufferId buffer, QString newName);
void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
void bufferMarkedAsRead(BufferId buffer);
+ void bufferActivityChanged(BufferId, Message::Types);
protected slots:
bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
protected slots:
bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
@@
-82,6
+101,7
@@
protected:
private:
QHash<BufferId, MsgId> _lastSeenMsg;
QHash<BufferId, MsgId> _markerLines;
private:
QHash<BufferId, MsgId> _lastSeenMsg;
QHash<BufferId, MsgId> _markerLines;
+ QHash<BufferId, Message::Types> _bufferActivities;
};
};