X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=6e718bea3f63a1b2b42bdd797ec89317e35ee33c;hp=1403c744511e91138ac9897f6c7dceae9f33115c;hb=7c9c1b348382b8b77f96a883945c522d32a478d5;hpb=cc7f376eb105f7bf931fb7f96c9601a7b3f69511 diff --git a/src/core/coresession.h b/src/core/coresession.h index 1403c744..6e718bea 100644 --- a/src/core/coresession.h +++ b/src/core/coresession.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,20 +18,24 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _CORESESSION_H_ -#define _CORESESSION_H_ +#ifndef CORESESSION_H +#define CORESESSION_H #include #include +#include "corecoreinfo.h" +#include "corealiasmanager.h" #include "message.h" -class BufferSyncer; class CoreBacklogManager; +class CoreBufferSyncer; class CoreBufferViewManager; +class CoreIrcListHelper; class Identity; +class CoreIdentity; class NetworkConnection; -class Network; +class CoreNetwork; struct NetworkInfo; class SignalProxy; @@ -45,40 +49,37 @@ public: ~CoreSession(); QList buffers() const; - UserId user() const; - Network *network(NetworkId) const; + inline UserId user() const { return _user; } + CoreNetwork *network(NetworkId) const; NetworkConnection *networkConnection(NetworkId) const; - Identity *identity(IdentityId) const; + CoreIdentity *identity(IdentityId) const; QVariant sessionState(); - SignalProxy *signalProxy() const; + inline SignalProxy *signalProxy() const { return _signalProxy; } - void attachNetworkConnection(NetworkConnection *conn); + const AliasManager &aliasManager() const { return _aliasManager; } + AliasManager &aliasManager() { return _aliasManager; } + + inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; } + +// void attachNetworkConnection(NetworkConnection *conn); //! Return necessary data for restoring the session after restarting the core void saveSessionState() const; void restoreSessionState(); public slots: - void networkStateRequested(); - - void addClient(QObject *socket); - - void connectToNetwork(NetworkId); - void disconnectFromNetwork(NetworkId id); + void addClient(QIODevice *device); + void addClient(SignalProxy *proxy); void msgFromClient(BufferInfo, QString message); //! Create an identity and propagate the changes to the clients. /** \param identity The identity to be created. */ - void createIdentity(const Identity &identity); - - //! Update an identity and propagate the changes to the clients. - /** \param identity The identity to be updated. - */ - void updateIdentity(const Identity &identity); + void createIdentity(const Identity &identity, const QVariantMap &additional); + void createIdentity(const CoreIdentity &identity); //! Remove identity and propagate that fact to the clients. /** \param identity The identity to be removed. @@ -88,48 +89,30 @@ public slots: //! Create a network and propagate the changes to the clients. /** \param info The network's settings. */ - void createNetwork(const NetworkInfo &info); + void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList()); - //! Update a network and propagate the changes to the clients. - /** \param info The updated network settings. - */ - void updateNetwork(const NetworkInfo &info); - - //! Remove identity and propagate that fact to the clients. - /** \param identity The identity to be removed. + //! Remove network and propagate that fact to the clients. + /** \param network The id of the network to be removed. */ void removeNetwork(NetworkId network); - //! Remove a buffer and it's backlog permanently - /** \param bufferId The id of the buffer to be removed. - * emits bufferRemoved(bufferId) on success. - */ - void removeBufferRequested(BufferId bufferId); - //! Rename a Buffer for a given network /* \param networkId The id of the network the buffer belongs to * \param newName The new name of the buffer * \param oldName The old name of the buffer - * emits bufferRenamed(bufferId, newName) on success. */ void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName); - void channelJoined(NetworkId id, const QString &channel, const QString &key = QString()); - void channelParted(NetworkId, const QString &channel); QHash persistentChannels(NetworkId) const; signals: void initialized(); + void sessionState(const QVariant &); //void msgFromGui(uint netid, QString buf, QString message); void displayMsg(Message message); void displayStatusMsg(QString, QString); - //void connectToIrc(QString net); - //void disconnectFromIrc(QString net); - - void bufferInfoUpdated(BufferInfo); - void scriptResult(QString result); //! Identity has been created. @@ -146,29 +129,21 @@ signals: void networkCreated(NetworkId); void networkRemoved(NetworkId); - void bufferRemoved(BufferId); - void bufferRenamed(BufferId, QString); private slots: void removeClient(QIODevice *dev); void recvStatusMsgFromServer(QString msg); void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", Message::Flags flags = Message::None); - void networkConnected(NetworkId networkid); - void networkDisconnected(NetworkId networkid); void destroyNetwork(NetworkId); - //! Called when storage updated a BufferInfo. - /** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers. - * \param user The buffer's owner (not necessarily us) - * \param bufferInfo The updated BufferInfo - */ - void updateBufferInfo(UserId user, const BufferInfo &bufferInfo); + void scriptRequest(QString script); - void storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId); + void clientsConnected(); + void clientsDisconnected(); - void scriptRequest(QString script); + void updateIdentityBySender(); private: void loadSettings(); @@ -177,14 +152,17 @@ private: UserId _user; SignalProxy *_signalProxy; - QHash _connections; - QHash _networks; - QHash _networksToRemove; - QHash _identities; + CoreAliasManager _aliasManager; + // QHash _connections; + QHash _networks; + // QHash _networksToRemove; + QHash _identities; - BufferSyncer *_bufferSyncer; + CoreBufferSyncer *_bufferSyncer; CoreBacklogManager *_backlogManager; CoreBufferViewManager *_bufferViewManager; + CoreIrcListHelper *_ircListHelper; + CoreCoreInfo _coreInfo; QScriptEngine *scriptEngine;