X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=2babb11155e93da040a56533757696a65f9c6222;hp=684cb581331358369f84eb3651254cca8b5b2eef;hb=aadd816dbcae859ce9ac5b44d609bd3094b3d6fc;hpb=1b113021e8d82f93f46e02cf66428aebfb7d0357 diff --git a/src/client/client.h b/src/client/client.h index 684cb581..2babb111 100644 --- 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; @@ -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(); @@ -116,6 +116,7 @@ public: 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; } @@ -129,7 +130,6 @@ signals: void showConfigWizard(const QVariantMap &coredata); void connected(); - void securedConnection(); void disconnected(); void coreConnectionStateChanged(bool); @@ -186,10 +186,6 @@ private slots: void setSyncedToCore(); void requestInitialBacklog(); void createDefaultBufferView(); - void createDefaultIdentity(); - void createDefaultNetworks(); - void setSecuredConnection(); - private: Client(QObject *parent = 0); @@ -208,7 +204,7 @@ private: BufferModel * _bufferModel; BufferSyncer * _bufferSyncer; ClientBacklogManager *_backlogManager; - BufferViewManager *_bufferViewManager; + ClientBufferViewManager *_bufferViewManager; ClientIrcListHelper *_ircListHelper; MessageModel *_messageModel;