Make branches/0.3 compile again for mere mortals. Should even run, since my stuff...

#ifdef'd out.
New features should go in this branch now. We'll see how it behaves over the next week or so, and then maybe make
this the new kitty-eating trunk.

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 8d60689..8d5e71b 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -21,21 +21,24 @@
 #include "client.h"
 
 #include "bufferinfo.h"
 #include "client.h"
 
 #include "bufferinfo.h"

+#include "buffermodel.h"
+#include "buffersettings.h"

 #include "buffersyncer.h"
 #include "buffersyncer.h"

-#include "clientbacklogmanager.h"

 #include "bufferviewmanager.h"
 #include "bufferviewmanager.h"

+#include "clientbacklogmanager.h"

 #include "global.h"
 #include "identity.h"
 #include "ircchannel.h"
 #include "ircuser.h"
 #include "message.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 "network.h"
 #include "networkmodel.h"

-#include "buffermodel.h"

 #include "quasselui.h"
 #include "signalproxy.h"
 #include "util.h"
 #include "quasselui.h"
 #include "signalproxy.h"
 #include "util.h"

-#include "buffersettings.h"

 
 QPointer<Client> Client::instanceptr = 0;
 AccountId Client::_currentCoreAccount = 0;
 
 QPointer<Client> Client::instanceptr = 0;
 AccountId Client::_currentCoreAccount = 0;


@@ -68,6 +71,7 @@ Client::Client(QObject *parent)
     _bufferSyncer(0),
     _backlogManager(new ClientBacklogManager(this)),
     _bufferViewManager(0),
     _bufferSyncer(0),
     _backlogManager(new ClientBacklogManager(this)),
     _bufferViewManager(0),

+    _messageModel(0),

     _connectedToCore(false),
     _syncedToCore(false)
 {
     _connectedToCore(false),
     _syncedToCore(false)
 {


@@ -90,7 +94,9 @@ void Client::init() {
          _networkModel, SLOT(networkRemoved(NetworkId)));
 
   _bufferModel = new BufferModel(_networkModel);
          _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 &)));
   SignalProxy *p = signalProxy();
 
   p->attachSlot(SIGNAL(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &)));


@@ -437,6 +443,9 @@ void Client::recvMessage(const Message &message) {
 
   // FIXME clean up code! (dup)
 
 
   // 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();
   if(msg.flags() & Message::Redirected) {
     BufferSettings bufferSettings;
     bool inStatus = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true)).toBool();


@@ -480,9 +489,12 @@ void Client::recvMessage(const Message &message) {
     b = buffer(msg.bufferInfo());
     b->appendMsg(msg);
   }
     b = buffer(msg.bufferInfo());
     b->appendMsg(msg);
   }

+#endif

   
   //bufferModel()->updateBufferActivity(msg);
 
   
   //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
   if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
     const Network *net = network(msg.bufferInfo().networkId());
     QString networkName = net != 0


@@ -492,6 +504,7 @@ void Client::recvMessage(const Message &message) {
     Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());
     monitorBuffer()->appendMsg(mmsg);
   }
     Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());
     monitorBuffer()->appendMsg(mmsg);
   }

+#endif

 
   emit messageReceived(msg);
 }
 
   emit messageReceived(msg);
 }


@@ -501,11 +514,13 @@ void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
 }
 
 void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
 }
 
 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;
   }
   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...
 
   if(msgs.isEmpty())
     return; // no work to be done...

diff --git a/src/client/client.h b/src/client/client.h
index b7e079e..e0ad4ec 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -30,6 +30,7 @@
 
 class BufferInfo;
 class Message;
 
 class BufferInfo;
 class Message;

+class MessageModel;

 
 class Identity;
 class Network;
 
 class Identity;
 class Network;


@@ -49,7 +50,6 @@ struct NetworkInfo;
 
 class QTimer;
 
 
 class QTimer;
 

-

 class Client : public QObject {
   Q_OBJECT
 
 class Client : public QObject {
   Q_OBJECT
 


@@ -216,6 +216,8 @@ private:
   ClientBacklogManager *_backlogManager;
   BufferViewManager *_bufferViewManager;
 
   ClientBacklogManager *_backlogManager;
   BufferViewManager *_bufferViewManager;
 

+  MessageModel *_messageModel;
+

   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;