#include "client.h"
#include "bufferinfo.h"
+#include "buffermodel.h"
+#include "buffersettings.h"
#include "buffersyncer.h"
-#include "clientbacklogmanager.h"
#include "bufferviewmanager.h"
+#include "clientbacklogmanager.h"
#include "global.h"
#include "identity.h"
#include "ircchannel.h"
#include "ircuser.h"
#include "message.h"
+#ifdef SPUTDEV
+# include "messagemodel.h"
+#endif
#include "network.h"
#include "networkmodel.h"
-#include "buffermodel.h"
#include "quasselui.h"
#include "signalproxy.h"
#include "util.h"
-#include "buffersettings.h"
QPointer<Client> Client::instanceptr = 0;
AccountId Client::_currentCoreAccount = 0;
_bufferSyncer(0),
_backlogManager(new ClientBacklogManager(this)),
_bufferViewManager(0),
+ _messageModel(0),
_connectedToCore(false),
_syncedToCore(false)
{
_networkModel, SLOT(networkRemoved(NetworkId)));
_bufferModel = new BufferModel(_networkModel);
-
+#ifdef SPUTDEV
+ _messageModel = new MessageModel(this);
+#endif
SignalProxy *p = signalProxy();
p->attachSlot(SIGNAL(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &)));
// FIXME clean up code! (dup)
+ // TODO: make redirected messages show up in the correct buffer!
+
+#ifndef SPUTDEV
if(msg.flags() & Message::Redirected) {
BufferSettings bufferSettings;
bool inStatus = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true)).toBool();
b = buffer(msg.bufferInfo());
b->appendMsg(msg);
}
+#endif
//bufferModel()->updateBufferActivity(msg);
+ // monitor buffer goes away
+#ifndef SPUTDEV
if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
const Network *net = network(msg.bufferInfo().networkId());
QString networkName = net != 0
Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());
monitorBuffer()->appendMsg(mmsg);
}
+#endif
emit messageReceived(msg);
}
}
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
+#ifndef SPUTDEV
Buffer *buffer_ = buffer(bufferId);
if(!buffer_) {
qWarning() << "Client::recvBacklogData(): received Backlog for unknown Buffer:" << bufferId;
return;
}
+#endif
if(msgs.isEmpty())
return; // no work to be done...