X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=40949ac51ac0caa78ad243703cc6d510da70853d;hb=188b778bd62a10521ab721a212f8ea2f62fd636a;hp=52133b68b4c7037e3ace2ad06eddb5fc34338f09;hpb=034708a59ca1ee3195263a90941a2b145c520fef;p=quassel.git diff --git a/src/client/client.h b/src/client/client.h index 52133b68..40949ac5 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -62,6 +62,7 @@ public: static Client *instance(); static void destroy(); static void init(AbstractUi *); + static AbstractUi *mainUi(); static QList networkIds(); static const Network * network(NetworkId); @@ -152,7 +153,7 @@ signals: void newClientSyncer(ClientSyncer *); - void logUpdated(); + void logUpdated(const QString &msg); public slots: //void selectBuffer(Buffer *); @@ -174,9 +175,9 @@ private slots: void coreNetworkCreated(NetworkId); void coreNetworkRemoved(NetworkId); - void setConnectedToCore(QIODevice *socket, AccountId id); - void setConnectedToInternalCore(); + void setConnectedToCore(AccountId id, QIODevice *socket = 0); void setSyncedToCore(); + void requestInitialBacklog(); void setSecuredConnection(); @@ -192,7 +193,7 @@ private: static QPointer instanceptr; SignalProxy * _signalProxy; - AbstractUi * mainUi; + AbstractUi * _mainUi; NetworkModel * _networkModel; BufferModel * _bufferModel; BufferSyncer * _bufferSyncer;