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