X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=3dd5b6aca2886ab7b1c4410f35c98254b4b91218;hp=2babb11155e93da040a56533757696a65f9c6222;hb=03a20917d9b3fe8c7651843b1d3d0ab2f50e90ef;hpb=18de40315dd00795c41016b266d5e9c158618f3a diff --git a/src/client/client.h b/src/client/client.h index 2babb111..3dd5b6ac 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -43,9 +43,10 @@ class NetworkModel; class BufferModel; class BufferSyncer; class ClientBacklogManager; +class ClientBufferViewManager; class ClientIrcListHelper; class ClientSyncer; -class ClientBufferViewManager; +class ClientUserInputHandler; class IrcUser; class IrcChannel; class SignalProxy; @@ -103,6 +104,7 @@ public: static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; } static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; } static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } + static inline ClientUserInputHandler *inputHandler() { return instance()->_inputHandler; } static AccountId currentCoreAccount(); @@ -110,7 +112,7 @@ 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); @@ -124,7 +126,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); @@ -162,8 +163,6 @@ signals: void logUpdated(const QString &msg); public slots: - //void selectBuffer(Buffer *); - void disconnectFromCore(); void bufferRemoved(BufferId bufferId); @@ -206,6 +205,7 @@ private: ClientBacklogManager *_backlogManager; ClientBufferViewManager *_bufferViewManager; ClientIrcListHelper *_ircListHelper; + ClientUserInputHandler *_inputHandler; MessageModel *_messageModel; AbstractMessageProcessor *_messageProcessor;