X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=9de37c01070589012227fd2b8c8f88549cf85830;hp=8b4305e343f64a61ba75c564ebf255dca157ef48;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d diff --git a/src/core/coresession.h b/src/core/coresession.h index 8b4305e3..9de37c01 100644 --- a/src/core/coresession.h +++ b/src/core/coresession.h @@ -50,174 +50,176 @@ struct NetworkInfo; class QScriptEngine; -class CoreSession : public QObject { - Q_OBJECT +class CoreSession : public QObject +{ + Q_OBJECT public: - CoreSession(UserId, bool restoreState, QObject *parent = 0); - ~CoreSession(); + CoreSession(UserId, bool restoreState, QObject *parent = 0); + ~CoreSession(); - QList buffers() const; - inline UserId user() const { return _user; } - CoreNetwork *network(NetworkId) const; - CoreIdentity *identity(IdentityId) const; - inline CoreNetworkConfig *networkConfig() const { return _networkConfig; } - NetworkConnection *networkConnection(NetworkId) const; + QList buffers() const; + inline UserId user() const { return _user; } + CoreNetwork *network(NetworkId) const; + CoreIdentity *identity(IdentityId) const; + inline CoreNetworkConfig *networkConfig() const { return _networkConfig; } + NetworkConnection *networkConnection(NetworkId) const; - QVariant sessionState(); + QVariant sessionState(); - inline SignalProxy *signalProxy() const { return _signalProxy; } + inline SignalProxy *signalProxy() const { return _signalProxy; } - const AliasManager &aliasManager() const { return _aliasManager; } - AliasManager &aliasManager() { return _aliasManager; } + const AliasManager &aliasManager() const { return _aliasManager; } + AliasManager &aliasManager() { return _aliasManager; } - inline EventManager *eventManager() const { return _eventManager; } - inline EventStringifier *eventStringifier() const { return _eventStringifier; } - inline CoreSessionEventProcessor *sessionEventProcessor() const { return _sessionEventProcessor; } - inline CtcpParser *ctcpParser() const { return _ctcpParser; } - inline IrcParser *ircParser() const { return _ircParser; } + inline EventManager *eventManager() const { return _eventManager; } + inline EventStringifier *eventStringifier() const { return _eventStringifier; } + inline CoreSessionEventProcessor *sessionEventProcessor() const { return _sessionEventProcessor; } + inline CtcpParser *ctcpParser() const { return _ctcpParser; } + inline IrcParser *ircParser() const { return _ircParser; } - inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; } + inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; } - inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; } + inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; } // void attachNetworkConnection(NetworkConnection *conn); - //! Return necessary data for restoring the session after restarting the core - void restoreSessionState(); + //! Return necessary data for restoring the session after restarting the core + void restoreSessionState(); public slots: - void addClient(QIODevice *device); - void addClient(SignalProxy *proxy); + void addClient(QIODevice *device); + void addClient(SignalProxy *proxy); - void msgFromClient(BufferInfo, QString message); + 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, const QVariantMap &additional); - void createIdentity(const CoreIdentity &identity); + //! Create an identity and propagate the changes to the clients. + /** \param identity The identity to be created. + */ + 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. - */ - void removeIdentity(IdentityId identity); + //! Remove identity and propagate that fact to the clients. + /** \param identity The identity to be removed. + */ + void removeIdentity(IdentityId identity); - //! Create a network and propagate the changes to the clients. - /** \param info The network's settings. - */ - void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList()); + //! Create a network and propagate the changes to the clients. + /** \param info The network's settings. + */ + void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList()); - //! Remove network and propagate that fact to the clients. - /** \param network The id of the network to be removed. - */ - void removeNetwork(NetworkId network); + //! Remove network and propagate that fact to the clients. + /** \param network The id of the network to be removed. + */ + void removeNetwork(NetworkId network); - //! 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 - */ - void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName); + //! 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 + */ + void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName); - QHash persistentChannels(NetworkId) const; + QHash persistentChannels(NetworkId) const; - //! Marks us away (or unaway) on all networks - void globalAway(const QString &msg = QString()); + //! Marks us away (or unaway) on all networks + void globalAway(const QString &msg = QString()); signals: - void initialized(); - void sessionState(const QVariant &); + void initialized(); + void sessionState(const QVariant &); - //void msgFromGui(uint netid, QString buf, QString message); - void displayMsg(Message message); - void displayStatusMsg(QString, QString); + //void msgFromGui(uint netid, QString buf, QString message); + void displayMsg(Message message); + void displayStatusMsg(QString, QString); - void scriptResult(QString result); + void scriptResult(QString result); - //! Identity has been created. - /** This signal is propagated to the clients to tell them that the given identity has been created. - * \param identity The new identity. - */ - void identityCreated(const Identity &identity); + //! Identity has been created. + /** This signal is propagated to the clients to tell them that the given identity has been created. + * \param identity The new identity. + */ + void identityCreated(const Identity &identity); - //! Identity has been removed. - /** This signal is propagated to the clients to inform them about the removal of the given identity. - * \param identity The identity that has been removed. - */ - void identityRemoved(IdentityId identity); + //! Identity has been removed. + /** This signal is propagated to the clients to inform them about the removal of the given identity. + * \param identity The identity that has been removed. + */ + void identityRemoved(IdentityId identity); - void networkCreated(NetworkId); - void networkRemoved(NetworkId); - void networkDisconnected(NetworkId); + void networkCreated(NetworkId); + void networkRemoved(NetworkId); + void networkDisconnected(NetworkId); protected: - virtual void customEvent(QEvent *event); + virtual void customEvent(QEvent *event); private slots: - void removeClient(QIODevice *dev); + void removeClient(QIODevice *dev); - void recvStatusMsgFromServer(QString msg); - void recvMessageFromServer(NetworkId networkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None); + void recvStatusMsgFromServer(QString msg); + void recvMessageFromServer(NetworkId networkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None); - void destroyNetwork(NetworkId); + void destroyNetwork(NetworkId); - void scriptRequest(QString script); + void scriptRequest(QString script); - void clientsConnected(); - void clientsDisconnected(); + void clientsConnected(); + void clientsDisconnected(); - void updateIdentityBySender(); + void updateIdentityBySender(); - void saveSessionState() const; + void saveSessionState() const; private: - void processMessages(); + void processMessages(); - void loadSettings(); - void initScriptEngine(); + void loadSettings(); + void initScriptEngine(); - /// Hook for converting events to the old displayMsg() handlers - Q_INVOKABLE void processMessageEvent(MessageEvent *event); + /// Hook for converting events to the old displayMsg() handlers + Q_INVOKABLE void processMessageEvent(MessageEvent *event); - UserId _user; + UserId _user; - SignalProxy *_signalProxy; - CoreAliasManager _aliasManager; - // QHash _connections; - QHash _networks; - // QHash _networksToRemove; - QHash _identities; + SignalProxy *_signalProxy; + CoreAliasManager _aliasManager; + // QHash _connections; + QHash _networks; + // QHash _networksToRemove; + QHash _identities; - CoreBufferSyncer *_bufferSyncer; - CoreBacklogManager *_backlogManager; - CoreBufferViewManager *_bufferViewManager; - CoreIrcListHelper *_ircListHelper; - CoreNetworkConfig *_networkConfig; - CoreCoreInfo _coreInfo; + CoreBufferSyncer *_bufferSyncer; + CoreBacklogManager *_backlogManager; + CoreBufferViewManager *_bufferViewManager; + CoreIrcListHelper *_ircListHelper; + CoreNetworkConfig *_networkConfig; + CoreCoreInfo _coreInfo; - EventManager *_eventManager; - EventStringifier *_eventStringifier; // should eventually move into client - CoreSessionEventProcessor *_sessionEventProcessor; - CtcpParser *_ctcpParser; - IrcParser *_ircParser; + EventManager *_eventManager; + EventStringifier *_eventStringifier; // should eventually move into client + CoreSessionEventProcessor *_sessionEventProcessor; + CtcpParser *_ctcpParser; + IrcParser *_ircParser; - QScriptEngine *scriptEngine; + QScriptEngine *scriptEngine; - QList _messageQueue; - bool _processMessages; - CoreIgnoreListManager _ignoreListManager; + QList _messageQueue; + bool _processMessages; + CoreIgnoreListManager _ignoreListManager; }; + struct RawMessage { - NetworkId networkId; - Message::Type type; - BufferInfo::Type bufferType; - QString target; - QString text; - QString sender; - Message::Flags flags; - RawMessage(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, const QString &target, const QString &text, const QString &sender, Message::Flags flags) - : networkId(networkId), type(type), bufferType(bufferType), target(target), text(text), sender(sender), flags(flags) {} + NetworkId networkId; + Message::Type type; + BufferInfo::Type bufferType; + QString target; + QString text; + QString sender; + Message::Flags flags; + RawMessage(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, const QString &target, const QString &text, const QString &sender, Message::Flags flags) + : networkId(networkId), type(type), bufferType(bufferType), target(target), text(text), sender(sender), flags(flags) {} }; #endif