fixes #413 - Icons in Nicklist

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

diff --git a/src/client/client.h b/src/client/client.h
index a67f2ba..3679d65 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -45,7 +45,7 @@ class BufferSyncer;
 class ClientBacklogManager;
 class ClientIrcListHelper;
 class ClientSyncer;
-class BufferViewManager;
+class ClientBufferViewManager;
 class IrcUser;
 class IrcChannel;
 class SignalProxy;
@@ -90,7 +90,7 @@ public:
    */
   static void removeIdentity(IdentityId id);
 
-  static void createNetwork(const NetworkInfo &info);
+  static void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   static void updateNetwork(const NetworkInfo &info);
   static void removeNetwork(NetworkId id);
 
@@ -102,7 +102,7 @@ public:
 
   static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
   static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
-  static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+  static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
 
   static AccountId currentCoreAccount();
 
@@ -129,7 +129,6 @@ signals:
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
-  void securedConnection();
   void disconnected();
   void coreConnectionStateChanged(bool);
 
@@ -154,7 +153,7 @@ signals:
   void networkCreated(NetworkId id);
   void networkRemoved(NetworkId id);
 
-  void requestCreateNetwork(const NetworkInfo &info);
+  void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   void requestRemoveNetwork(NetworkId);
 
   void newClientSyncer(ClientSyncer *);
@@ -185,10 +184,9 @@ private slots:
   void setConnectedToCore(AccountId id, QIODevice *socket = 0);
   void setSyncedToCore();
   void requestInitialBacklog();
-  void createDefautBufferView();
+  void createDefaultBufferView();
   void createDefaultIdentity();
-  void setSecuredConnection();
-
+  void createDefaultNetworks();
 
 private:
   Client(QObject *parent = 0);
@@ -207,7 +205,7 @@ private:
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;
   ClientBacklogManager *_backlogManager;
-  BufferViewManager *_bufferViewManager;
+  ClientBufferViewManager *_bufferViewManager;
   ClientIrcListHelper *_ircListHelper;
 
   MessageModel *_messageModel;