X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=9f881d117f2d322ae9e247a352474c5317f80497;hp=62ad9b09725c352e16ab2cadfe70fe688f862c5a;hb=167ef57a636052f8e18a206e84c3447552e84d2b;hpb=332069a1830ed3a055ac6f2d7661bae1cc83e40c diff --git a/src/client/client.h b/src/client/client.h index 62ad9b09..9f881d11 100644 --- 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); @@ -172,6 +175,7 @@ private slots: void coreNetworkRemoved(NetworkId); void setConnectedToCore(QIODevice *socket, AccountId id); + void setConnectedToInternalCore(); void setSyncedToCore(); void setSecuredConnection(); @@ -187,8 +191,6 @@ private: static QPointer instanceptr; - QPointer socket; - SignalProxy * _signalProxy; AbstractUi * mainUi; NetworkModel * _networkModel; @@ -210,6 +212,9 @@ private: static AccountId _currentCoreAccount; + QString _debugLogBuffer; + QTextStream _debugLog; + friend class ClientSyncer; };