X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=8a68d99769831828308ad59edc15054ab2dbd950;hb=e7494078ad676d9fd14fab0396f51608a3ad46dc;hp=2d073c5f512103cfc92218e774a3105675277a51;hpb=299541db5d6586c0b09e036816dfd28477ebc249;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index 2d073c5f..8a68d997 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -112,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();
@@ -149,21 +152,18 @@ signals:
 
   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);
@@ -174,7 +174,7 @@ private slots:
   void coreNetworkCreated(NetworkId);
   void coreNetworkRemoved(NetworkId);
 
-  void setConnectedToCore(QIODevice *socket, AccountId id);
+  void setConnectedToCore(AccountId id, QIODevice *socket = 0);
   void setSyncedToCore();
   void setSecuredConnection();
 
@@ -190,8 +190,6 @@ private:
 
   static QPointer<Client> instanceptr;
 
-  QPointer<QIODevice> socket;
-
   SignalProxy * _signalProxy;
   AbstractUi * mainUi;
   NetworkModel * _networkModel;
@@ -213,6 +211,9 @@ private:
 
   static AccountId _currentCoreAccount;
 
+  QString _debugLogBuffer;
+  QTextStream _debugLog;
+
   friend class ClientSyncer;
 };