X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=127a07f87575accbf120ccb087344f71cf60cdfc;hp=fc39e96d480515dc7b1548663ba337a41663357b;hb=54ead1bace1c9306ccfd5ebd7fb7bbd0c9843db7;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c diff --git a/src/client/client.h b/src/client/client.h index fc39e96d..127a07f8 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -53,10 +53,12 @@ class ClientTransferManager; class ClientUserInputHandler; class CoreAccountModel; class CoreConnection; +class DccConfig; class IrcUser; class IrcChannel; class NetworkConfig; class SignalProxy; +class TransferModel; struct NetworkInfo; @@ -113,6 +115,7 @@ public: static inline ClientAliasManager *aliasManager() { return instance()->_aliasManager; } static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; } + static inline DccConfig *dccConfig() { return instance()->_dccConfig; } static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; } static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } static inline BufferViewOverlay *bufferViewOverlay() { return instance()->_bufferViewOverlay; } @@ -120,6 +123,7 @@ public: static inline NetworkConfig *networkConfig() { return instance()->_networkConfig; } static inline ClientIgnoreListManager *ignoreListManager() { return instance()->_ignoreListManager; } static inline ClientTransferManager *transferManager() { return instance()->_transferManager; } + static inline TransferModel *transferModel() { return instance()->_transferModel; } static inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; } static inline CoreConnection *coreConnection() { return instance()->_coreConnection; } @@ -222,7 +226,7 @@ private slots: void corePasswordChanged(PeerPtr, bool success); - void requestInitialBacklog(); + void finishConnectionInitialization(); void sendBufferedUserInput(); @@ -231,6 +235,8 @@ private: virtual ~Client(); void init(); + void requestInitialBacklog(); + static void addNetwork(Network *); static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } @@ -245,11 +251,13 @@ private: ClientBacklogManager *_backlogManager; ClientBufferViewManager *_bufferViewManager; BufferViewOverlay *_bufferViewOverlay; + DccConfig *_dccConfig; ClientIrcListHelper *_ircListHelper; ClientUserInputHandler *_inputHandler; NetworkConfig *_networkConfig; ClientIgnoreListManager *_ignoreListManager; ClientTransferManager *_transferManager; + TransferModel *_transferModel; MessageModel *_messageModel; AbstractMessageProcessor *_messageProcessor;