projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update/correct german-translation & add brots nick to his name in about page
[quassel.git]
/
src
/
common
/
buffersyncer.cpp
diff --git
a/src/common/buffersyncer.cpp
b/src/common/buffersyncer.cpp
index
7fe424f
..
82fe0da
100644
(file)
--- a/
src/common/buffersyncer.cpp
+++ b/
src/common/buffersyncer.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8 by the Quassel IRC Team
*
+ * Copyright (C) 2005-0
9 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 *
@@
-20,56
+20,67
@@
#include "buffersyncer.h"
#include "buffersyncer.h"
-BufferSyncer::BufferSyncer(QObject *parent) : SyncableObject(parent) {
-
-
+INIT_SYNCABLE_OBJECT(BufferSyncer)
+BufferSyncer::BufferSyncer(QObject *parent)
+ : SyncableObject(parent)
+{
}
}
+BufferSyncer::BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, QObject *parent)
+ : SyncableObject(parent),
+ _lastSeenMsg(lastSeenMsg)
+{
+}
-QDateTime BufferSyncer::lastSeen(BufferId buffer) const {
- if(_lastSeen.contains(buffer)) return _lastSeen[buffer];
- return QDateTime();
+MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const {
+ if(_lastSeenMsg.contains(buffer))
+ return _lastSeenMsg[buffer];
+ return MsgId();
}
}
-bool BufferSyncer::setLastSeen
(BufferId buffer, const QDateTime &time
) {
- if(!
_lastSeen.contains(buffer
))
+bool BufferSyncer::setLastSeen
Msg(BufferId buffer, const MsgId &msgId
) {
+ if(!
msgId.isValid(
))
return false;
return false;
-
- if(_lastSeen[buffer] < time) {
- _lastSeen[buffer] = time;
- emit lastSeenSet(buffer, time);
+
+ const MsgId oldLastSeenMsg = lastSeenMsg(buffer);
+ if(!oldLastSeenMsg.isValid() || oldLastSeenMsg < msgId) {
+ _lastSeenMsg[buffer] = msgId;
+ SYNC(ARG(buffer), ARG(msgId))
+ emit lastSeenMsgSet(buffer, msgId);
return true;
}
return false;
}
return true;
}
return false;
}
-QVariantList BufferSyncer::initLastSeen() const {
+QVariantList BufferSyncer::initLastSeen
Msg
() const {
QVariantList list;
QVariantList list;
- foreach(BufferId id, _lastSeen.keys()) {
- list << QVariant::fromValue<BufferId>(id) << _lastSeen[id];
+ QHash<BufferId, MsgId>::const_iterator iter = _lastSeenMsg.constBegin();
+ while(iter != _lastSeenMsg.constEnd()) {
+ list << QVariant::fromValue<BufferId>(iter.key())
+ << QVariant::fromValue<MsgId>(iter.value());
+ iter++;
}
return list;
}
}
return list;
}
-void BufferSyncer::initSetLastSeen(const QVariantList &list) {
- _lastSeen.clear();
+void BufferSyncer::initSetLastSeen
Msg
(const QVariantList &list) {
+ _lastSeen
Msg
.clear();
Q_ASSERT(list.count() % 2 == 0);
for(int i = 0; i < list.count(); i += 2) {
Q_ASSERT(list.count() % 2 == 0);
for(int i = 0; i < list.count(); i += 2) {
- setLastSeen
(list[i].value<BufferId>(), list[i+1].toDateTime
());
+ setLastSeen
Msg(list[i].value<BufferId>(), list[i+1].value<MsgId>
());
}
}
}
}
-void BufferSyncer::requestSetLastSeen(BufferId buffer, const QDateTime &time) {
- if(setLastSeen(buffer, time)) emit setLastSeenRequested(buffer, time);
-}
-
-
-void BufferSyncer::requestRemoveBuffer(BufferId buffer) {
- emit removeBufferRequested(buffer);
-}
-
void BufferSyncer::removeBuffer(BufferId buffer) {
void BufferSyncer::removeBuffer(BufferId buffer) {
- if(_lastSeen.contains(buffer))
- _lastSeen.remove(buffer);
+ if(_lastSeenMsg.contains(buffer))
+ _lastSeenMsg.remove(buffer);
+ SYNC(ARG(buffer))
emit bufferRemoved(buffer);
}
emit bufferRemoved(buffer);
}
+
+void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) {
+ if(_lastSeenMsg.contains(buffer2))
+ _lastSeenMsg.remove(buffer2);
+ SYNC(ARG(buffer1), ARG(buffer2))
+ emit buffersPermanentlyMerged(buffer1, buffer2);
+}