X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=2d073c5f512103cfc92218e774a3105675277a51;hp=8b991bdaaae7cf0afb7e9cdf927d9a3ee2cf6b70;hb=299541db5d6586c0b09e036816dfd28477ebc249;hpb=c0c8cea57282c56951562e427bc1acb3ee2028a3 diff --git a/src/client/client.h b/src/client/client.h index 8b991bda..2d073c5f 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -18,17 +18,17 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _CLIENT_H_ -#define _CLIENT_H_ +#ifndef CLIENT_H_ +#define CLIENT_H_ #include #include #include #include -#include "buffer.h" // needed for activity lvl +#include "bufferinfo.h" +#include "types.h" -class BufferInfo; class Message; class MessageModel; class AbstractMessageProcessor; @@ -43,6 +43,7 @@ class BufferModel; class BufferSyncer; class ClientBacklogManager; class ClientIrcListHelper; +class ClientSyncer; class BufferViewManager; class IrcUser; class IrcChannel; @@ -62,11 +63,6 @@ public: static void destroy(); static void init(AbstractUi *); - static QList allBufferInfos(); - static QList buffers(); - // static Buffer *buffer(BufferId bufferUid); - static Buffer *buffer(BufferInfo); - static QList networkIds(); static const Network * network(NetworkId); @@ -118,10 +114,6 @@ public: signals: void sendInput(BufferInfo, QString message); - void showBuffer(Buffer *); - void bufferUpdated(BufferInfo bufferInfo); - void backlogReceived(Buffer *, QList); - void requestBacklog(BufferInfo, QVariant, QVariant); void requestNetworkStates(); void showConfigWizard(const QVariantMap &coredata); @@ -153,9 +145,10 @@ signals: void networkRemoved(NetworkId id); void requestCreateNetwork(const NetworkInfo &info); - void requestUpdateNetwork(const NetworkInfo &info); void requestRemoveNetwork(NetworkId); + void newClientSyncer(ClientSyncer *); + public slots: //void selectBuffer(Buffer *); @@ -174,10 +167,7 @@ private slots: void recvMessage(const Message &message); void recvStatusMsg(QString network, QString message); - void receiveBacklog(BufferId bufferId, const QVariantList &msgs); - void updateBufferInfo(BufferInfo); - void bufferDestroyed(); void networkDestroyed(); void coreIdentityCreated(const Identity &); void coreIdentityRemoved(IdentityId); @@ -198,8 +188,6 @@ private: static void setCurrentCoreAccount(AccountId); static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } - Buffer *statusBuffer(const NetworkId &networkid) const; - static QPointer instanceptr; QPointer socket; @@ -220,8 +208,6 @@ private: bool _connectedToCore, _syncedToCore; - QHash _buffers; - QHash _statusBuffers; // fast lookup QHash _networks; QHash _identities;