* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef _CORESESSION_H_
-#define _CORESESSION_H_
+#ifndef CORESESSION_H
+#define CORESESSION_H
#include <QString>
#include <QVariant>
+#include "corecoreinfo.h"
+#include "corealiasmanager.h"
#include "message.h"
+class BufferSyncer;
+class CoreBacklogManager;
+class CoreBufferViewManager;
+class CoreIrcListHelper;
class Identity;
-class NetworkConnection; // FIXME get rid of
-class Network;
+class NetworkConnection;
+class CoreNetwork;
+struct NetworkInfo;
class SignalProxy;
class QScriptEngine;
~CoreSession();
QList<BufferInfo> 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;
QVariant sessionState();
- //! Retrieve a piece of session-wide data.
- QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
+ inline SignalProxy *signalProxy() const { return _signalProxy; }
- SignalProxy *signalProxy() const;
+ const AliasManager &aliasManager() const { return _aliasManager; }
+ AliasManager &aliasManager() { return _aliasManager; }
- void attachNetworkConnection(NetworkConnection *conn);
+ 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:
- //! Store a piece session-wide data and distribute it to connected clients.
- void storeSessionData(const QString &key, const QVariant &data);
-
- void networkStateRequested();
-
- void addClient(QObject *socket);
-
- void connectToNetwork(QString, const QVariant &previousState = QVariant());
- void connectToNetwork(NetworkId, const QVariant &previousState = QVariant());
+ void addClient(QIODevice *device);
+ void addClient(SignalProxy *proxy);
- //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
- void sendBacklog(BufferInfo, QVariant, QVariant);
void msgFromClient(BufferInfo, QString message);
//! Create an identity and propagate the changes to the clients.
*/
void createIdentity(const Identity &identity);
- //! Update an identity and propagate the changes to the clients.
- /** \param identity The identity to be updated.
+ //! Remove identity and propagate that fact to the clients.
+ /** \param identity The identity to be removed.
*/
- void updateIdentity(const Identity &identity);
+ 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);
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
*/
- void removeIdentity(IdentityId identity);
+ 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);
+
+ QHash<QString, QString> 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 backlogData(BufferInfo, QVariantList, bool done);
-
- void bufferInfoUpdated(BufferInfo);
- void sessionDataChanged(const QString &key);
- void sessionDataChanged(const QString &key, const QVariant &data);
-
void scriptResult(QString result);
//! Identity has been created.
*/
void identityRemoved(IdentityId identity);
+ 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, QString target, QString text, QString sender = "", quint8 flags = Message::None);
- void networkConnected(NetworkId networkid);
- void networkDisconnected(NetworkId 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 recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", Message::Flags flags = Message::None);
+
+ void destroyNetwork(NetworkId);
+
+ void identityUpdated(const QVariantMap &);
+
+ void storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId);
void scriptRequest(QString script);
+ void clientsConnected();
+ void clientsDisconnected();
+
private:
+ void loadSettings();
void initScriptEngine();
UserId _user;
SignalProxy *_signalProxy;
- QHash<NetworkId, NetworkConnection *> _connections;
- QHash<NetworkId, Network *> _networks;
+ CoreAliasManager _aliasManager;
+ // QHash<NetworkId, NetworkConnection *> _connections;
+ QHash<NetworkId, CoreNetwork *> _networks;
+ // QHash<NetworkId, CoreNetwork *> _networksToRemove;
QHash<IdentityId, Identity *> _identities;
- QVariantMap sessionData;
+ BufferSyncer *_bufferSyncer;
+ CoreBacklogManager *_backlogManager;
+ CoreBufferViewManager *_bufferViewManager;
+ CoreIrcListHelper *_ircListHelper;
+ CoreCoreInfo _coreInfo;
QScriptEngine *scriptEngine;
projects / quassel.git / blobdiff