projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing BR #147. Needs core update.
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
64092dd
..
ea1738b
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-26,6
+26,7
@@
#include "buffersyncer.h"
#include "bufferviewmanager.h"
#include "clientbacklogmanager.h"
#include "buffersyncer.h"
#include "bufferviewmanager.h"
#include "clientbacklogmanager.h"
+#include "clientirclisthelper.h"
#include "global.h"
#include "identity.h"
#include "ircchannel.h"
#include "global.h"
#include "identity.h"
#include "ircchannel.h"
@@
-72,10
+73,13
@@
Client::Client(QObject *parent)
_backlogManager(new ClientBacklogManager(this)),
_bufferViewManager(0),
_messageModel(0),
_backlogManager(new ClientBacklogManager(this)),
_bufferViewManager(0),
_messageModel(0),
+ _ircListHelper(new ClientIrcListHelper(this)),
_connectedToCore(false),
_syncedToCore(false)
{
_monitorBuffer = new Buffer(BufferInfo(), this);
_connectedToCore(false),
_syncedToCore(false)
{
_monitorBuffer = new Buffer(BufferInfo(), this);
+ _signalProxy->synchronize(_ircListHelper);
+
connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)),
this, SLOT(receiveBacklog(BufferId, const QVariantList &)));
}
connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)),
this, SLOT(receiveBacklog(BufferId, const QVariantList &)));
}
@@
-242,7
+246,8
@@
void Client::coreNetworkCreated(NetworkId id) {
}
void Client::coreNetworkRemoved(NetworkId id) {
}
void Client::coreNetworkRemoved(NetworkId id) {
- if(!_networks.contains(id)) return;
+ if(!_networks.contains(id))
+ return;
Network *net = _networks.take(id);
emit networkRemoved(net->networkId());
net->deleteLater();
Network *net = _networks.take(id);
emit networkRemoved(net->networkId());
net->deleteLater();
@@
-497,7
+502,7
@@
void Client::recvMessage(const Message &message) {
? net->networkName() + ":"
: QString();
QString sender = networkName + msg.bufferInfo().bufferName() + ":" + msg.sender();
? net->networkName() + ":"
: QString();
QString sender = networkName + msg.bufferInfo().bufferName() + ":" + msg.sender();
- Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.
text
(), sender, msg.flags());
+ Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.
contents
(), sender, msg.flags());
monitorBuffer()->appendMsg(mmsg);
}
emit messageReceived(msg);
monitorBuffer()->appendMsg(mmsg);
}
emit messageReceived(msg);
@@
-505,8
+510,8
@@
void Client::recvMessage(const Message &message) {
#else
void Client::recvMessage(const Message &msg) {
#else
void Client::recvMessage(const Message &msg) {
-
-
+ //checkForHighlight(msg);
+ _messageModel->insertMessage(msg);
}
#endif /* SPUTDEV */
}
#endif /* SPUTDEV */
@@
-515,11
+520,20
@@
void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
//recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
}
//recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
}
+#ifdef SPUTDEV
+void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
+ //checkForHighlight(msg);
+ foreach(QVariant v, msgs) {
+ _messageModel->insertMessage(v.value<Message>());
+ }
+}
+
+#else
+
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
-#ifndef SPUTDEV
Buffer *buffer_ = buffer(bufferId);
if(!buffer_) {
Buffer *buffer_ = buffer(bufferId);
if(!buffer_) {
- qWarning() << "Client::rec
vBacklogData
(): received Backlog for unknown Buffer:" << bufferId;
+ qWarning() << "Client::rec
eiveBacklog
(): received Backlog for unknown Buffer:" << bufferId;
return;
}
return;
}
@@
-542,8
+556,8
@@
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
if(!layoutTimer->isActive()) {
layoutTimer->start();
}
if(!layoutTimer->isActive()) {
layoutTimer->start();
}
-#endif
}
}
+#endif /* SPUTDEV */
void Client::layoutMsg() {
if(layoutQueue.isEmpty()) {
void Client::layoutMsg() {
if(layoutQueue.isEmpty()) {
@@
-555,7
+569,7
@@
void Client::layoutMsg() {
if(buffer->layoutMsg()) {
layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin
return;
if(buffer->layoutMsg()) {
layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin
return;
- }
+ }
if(layoutQueue.isEmpty())
layoutTimer->stop();
if(layoutQueue.isEmpty())
layoutTimer->stop();
@@
-579,7
+593,7
@@
void Client::checkForHighlight(Message &msg) {
QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$");
if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
&& !(msg.flags() & Message::Self)
QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$");
if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
&& !(msg.flags() & Message::Self)
- && nickRegExp.exactMatch(msg.
text
())) {
+ && nickRegExp.exactMatch(msg.
contents
())) {
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
@@
-599,7
+613,7
@@
void Client::checkForHighlight(Message &msg) {
}
if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
&& !(msg.flags() & Message::Self)
}
if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
&& !(msg.flags() & Message::Self)
- && userRegExp.exactMatch(msg.
text
())) {
+ && userRegExp.exactMatch(msg.
contents
())) {
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
@@
-628,7
+642,7
@@
void Client::removeBuffer(BufferId id) {
}
void Client::bufferRemoved(BufferId bufferId) {
}
void Client::bufferRemoved(BufferId bufferId) {
- // first remove the buffer from has. this prohibits further lastSeenUpdates
+ // first remove the buffer from has
h
. this prohibits further lastSeenUpdates
Buffer *buff = 0;
if(_buffers.contains(bufferId)) {
buff = _buffers.take(bufferId);
Buffer *buff = 0;
if(_buffers.contains(bufferId)) {
buff = _buffers.take(bufferId);