projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Prepare Quassel::quit() to be used more widely
[quassel.git]
/
src
/
common
/
buffersyncer.h
diff --git
a/src/common/buffersyncer.h
b/src/common/buffersyncer.h
index
34d59c1
..
9ca0c01
100644
(file)
--- a/
src/common/buffersyncer.h
+++ b/
src/common/buffersyncer.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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 *
@@
-32,13
+32,14
@@
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, const QHash<BufferId, Message::Types> &activities, QObject *parent);
+ explicit BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, const QHash<BufferId, MsgId> &markerLines, const QHash<BufferId, Message::Types> &activities,
const QHash<BufferId, int> &highlightCounts,
QObject *parent);
inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
MsgId lastSeenMsg(BufferId buffer) const;
MsgId markerLine(BufferId buffer) const;
Message::Types activity(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;
+ int highlightCount(BufferId buffer) const;
void markActivitiesChanged() {
for (auto buffer : _bufferActivities.keys()) {
void markActivitiesChanged() {
for (auto buffer : _bufferActivities.keys()) {
@@
-46,6
+47,12
@@
public:
}
}
}
}
+ void markHighlightCountsChanged() {
+ for (auto buffer : _highlightCounts.keys()) {
+ emit highlightCountChanged(buffer, highlightCount(buffer));
+ }
+ }
+
public slots:
QVariantList initLastSeenMsg() const;
void initSetLastSeenMsg(const QVariantList &);
public slots:
QVariantList initLastSeenMsg() const;
void initSetLastSeenMsg(const QVariantList &);
@@
-56,6
+63,9
@@
public slots:
QVariantList initActivities() const;
void initSetActivities(const QVariantList &);
QVariantList initActivities() const;
void initSetActivities(const QVariantList &);
+ QVariantList initHighlightCounts() const;
+ void initSetHighlightCounts(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); }
@@
-66,6
+76,12
@@
public slots:
emit bufferActivityChanged(buffer, flags);
}
emit bufferActivityChanged(buffer, flags);
}
+ virtual inline void setHighlightCount(BufferId buffer, int count) {
+ SYNC(ARG(buffer), ARG(count));
+ _highlightCounts[buffer] = count;
+ emit highlightCountChanged(buffer, count);
+ }
+
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);
@@
-88,6
+104,7
@@
signals:
void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
void bufferMarkedAsRead(BufferId buffer);
void bufferActivityChanged(BufferId, Message::Types);
void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
void bufferMarkedAsRead(BufferId buffer);
void bufferActivityChanged(BufferId, Message::Types);
+ void highlightCountChanged(BufferId, int);
protected slots:
bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
protected slots:
bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
@@
-102,6
+119,7
@@
private:
QHash<BufferId, MsgId> _lastSeenMsg;
QHash<BufferId, MsgId> _markerLines;
QHash<BufferId, Message::Types> _bufferActivities;
QHash<BufferId, MsgId> _lastSeenMsg;
QHash<BufferId, MsgId> _markerLines;
QHash<BufferId, Message::Types> _bufferActivities;
+ QHash<BufferId, int> _highlightCounts;
};
};