postponed backlog loading until custom views are loaded and the buffersyncer knows...

[quassel.git] / src / client / client.h

diff --git a/src/client/client.h b/src/client/client.h
index 62ad9b0..40086ac 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -43,6 +43,7 @@ class BufferModel;
 class BufferSyncer;
 class ClientBacklogManager;
 class ClientIrcListHelper;
+class ClientSyncer;
 class BufferViewManager;
 class IrcUser;
 class IrcChannel;
@@ -111,6 +112,9 @@ public:
   static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
   static void removeBuffer(BufferId id);
 
+  static void logMessage(QtMsgType type, const char *msg);
+  static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
+
 signals:
   void sendInput(BufferInfo, QString message);
   void requestNetworkStates();
@@ -146,21 +150,20 @@ signals:
   void requestCreateNetwork(const NetworkInfo &info);
   void requestRemoveNetwork(NetworkId);
 
+  void newClientSyncer(ClientSyncer *);
+
+  void logUpdated(const QString &msg);
+
 public slots:
   //void selectBuffer(Buffer *);
 
   void disconnectFromCore();
 
-  void setCoreConfiguration(const QVariantMap &settings);
-
   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);
 
 private slots:
-  //void coreSocketError(QAbstractSocket::SocketError);
-
-  //void networkConnected(NetworkId);
-  //void networkDisconnected(NetworkId);
+  void disconnectedFromCore();
 
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
@@ -171,8 +174,9 @@ private slots:
   void coreNetworkCreated(NetworkId);
   void coreNetworkRemoved(NetworkId);
 
-  void setConnectedToCore(QIODevice *socket, AccountId id);
+  void setConnectedToCore(AccountId id, QIODevice *socket = 0);
   void setSyncedToCore();
+  void requestInitialBacklog();
   void setSecuredConnection();
 
 
@@ -187,8 +191,6 @@ private:
 
   static QPointer<Client> instanceptr;
 
-  QPointer<QIODevice> socket;
-
   SignalProxy * _signalProxy;
   AbstractUi * mainUi;
   NetworkModel * _networkModel;
@@ -210,6 +212,9 @@ private:
 
   static AccountId _currentCoreAccount;
 
+  QString _debugLogBuffer;
+  QTextStream _debugLog;
+
   friend class ClientSyncer;
 };