X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=127a07f87575accbf120ccb087344f71cf60cdfc;hb=729e90cd941776ea76192a6c3bf110d2c572b0cd;hp=445648b23fed023a10b3728ccb0659cab7b45652;hpb=eaa1bd30bc088e5cae6d8a742d7aedb3d8ff1897;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index 445648b2..127a07f8 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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; }
@@ -142,6 +146,8 @@ public:
     static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2);
     static void purgeKnownBufferIds();
 
+    static void changePassword(const QString &oldPassword, const QString &newPassword);
+
 #if QT_VERSION < 0x050000
     static void logMessage(QtMsgType type, const char *msg);
 #else
@@ -191,7 +197,9 @@ signals:
      */
     void bufferMarkedAsRead(BufferId id);
 
-    void clientChangePassword(QString password);
+    //! Requests a password change (user name must match the currently logged in user)
+    void requestPasswordChange(PeerPtr peer, const QString &userName, const QString &oldPassword, const QString &newPassword);
+    void passwordChanged(bool success);
 
 public slots:
     void disconnectFromCore();
@@ -202,8 +210,6 @@ public slots:
 
     void markBufferAsRead(BufferId id);
 
-    void changePassword(QString newPassword);
-
 private slots:
     void setSyncedToCore();
     void setDisconnectedFromCore();
@@ -218,7 +224,9 @@ private slots:
     void coreNetworkCreated(NetworkId);
     void coreNetworkRemoved(NetworkId);
 
-    void requestInitialBacklog();
+    void corePasswordChanged(PeerPtr, bool success);
+
+    void finishConnectionInitialization();
 
     void sendBufferedUserInput();
 
@@ -227,6 +235,8 @@ private:
     virtual ~Client();
     void init();
 
+    void requestInitialBacklog();
+
     static void addNetwork(Network *);
     static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
@@ -241,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;