X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=47877311781544c407f834205c0b33f81ddc879e;hb=e9845108739563c7cf40e88c26a051f1f8702cd1;hp=ea30bcd41ec6e4b34a54fc2814d17d755fe48120;hpb=236dda81632fa792e788d45b0f4f31b973823f7f;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index ea30bcd4..47877311 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -42,10 +42,13 @@ class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
 class BufferSyncer;
+class BufferViewOverlay;
+class ClientAliasManager;
 class ClientBacklogManager;
+class ClientBufferViewManager;
 class ClientIrcListHelper;
 class ClientSyncer;
-class BufferViewManager;
+class ClientUserInputHandler;
 class IrcUser;
 class IrcChannel;
 class SignalProxy;
@@ -60,6 +63,7 @@ public:
     RemoteCore
   };
 
+  static bool instanceExists();
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);
@@ -100,9 +104,12 @@ public:
   static inline AbstractMessageProcessor *messageProcessor() { return instance()->_messageProcessor; }
   static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
 
+  static inline ClientAliasManager *aliasManager() { return instance()->_aliasManager; }
   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 inline BufferViewOverlay *bufferViewOverlay() { return instance()->_bufferViewOverlay; }
+  static inline ClientUserInputHandler *inputHandler() { return instance()->_inputHandler; }
 
   static AccountId currentCoreAccount();
 
@@ -110,12 +117,13 @@ public:
   static bool isSynced();
   static inline bool internalCore() { return instance()->_internalCore; }
 
-  static void userInput(BufferInfo bufferInfo, QString message);
+  static void userInput(const BufferInfo &bufferInfo, const QString &message);
 
   static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
   static void removeBuffer(BufferId id);
   static void renameBuffer(BufferId bufferId, const QString &newName);
   static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2);
+  static void purgeKnownBufferIds();
 
   static void logMessage(QtMsgType type, const char *msg);
   static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
@@ -123,7 +131,6 @@ public:
   static inline void registerClientSyncer(ClientSyncer *syncer) { emit instance()->newClientSyncer(syncer); }
 
 signals:
-  void sendInput(BufferInfo, QString message);
   void requestNetworkStates();
 
   void showConfigWizard(const QVariantMap &coredata);
@@ -161,8 +168,6 @@ signals:
   void logUpdated(const QString &msg);
 
 public slots:
-  //void selectBuffer(Buffer *);
-
   void disconnectFromCore();
 
   void bufferRemoved(BufferId bufferId);
@@ -185,8 +190,8 @@ private slots:
   void setSyncedToCore();
   void requestInitialBacklog();
   void createDefaultBufferView();
-  void createDefaultIdentity();
-  void createDefaultNetworks();
+
+  void sendBufferedUserInput();
 
 private:
   Client(QObject *parent = 0);
@@ -204,9 +209,12 @@ private:
   NetworkModel * _networkModel;
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;
+  ClientAliasManager *_aliasManager;
   ClientBacklogManager *_backlogManager;
-  BufferViewManager *_bufferViewManager;
+  ClientBufferViewManager *_bufferViewManager;
+  BufferViewOverlay *_bufferViewOverlay;
   ClientIrcListHelper *_ircListHelper;
+  ClientUserInputHandler *_inputHandler;
 
   MessageModel *_messageModel;
   AbstractMessageProcessor *_messageProcessor;
@@ -224,6 +232,8 @@ private:
   QString _debugLogBuffer;
   QTextStream _debugLog;
 
+  QList<QPair<BufferInfo, QString> > _userInputBuffer;
+
   friend class ClientSyncer;
 };