Make Client::mainUi() accessible, needed for some things in uisupport

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

diff --git a/src/client/client.h b/src/client/client.h
index 52133b6..40949ac 100644 (file)
--- 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<NetworkId> 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<Client> instanceptr;
 
   SignalProxy * _signalProxy;
-  AbstractUi * mainUi;
+  AbstractUi * _mainUi;
   NetworkModel * _networkModel;
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;