/***************************************************************************
- * 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 *
* 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 CoreBacklogManager;
+class CoreBufferSyncer;
+class CoreBufferViewManager;
+class CoreIrcListHelper;
class Identity;
+class CoreIdentity;
class NetworkConnection;
-class Network;
+class CoreNetwork;
struct NetworkInfo;
class SignalProxy;
~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;
+ 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 addClient(QIODevice *device);
+ void addClient(SignalProxy *proxy);
- void connectToNetwork(QString, const QVariant &previousState = QVariant());
- void connectToNetwork(NetworkId, const QVariant &previousState = QVariant());
- void disconnectFromNetwork(NetworkId id);
-
- //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.
/** \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.
//! 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.
+ //! Remove network and propagate that fact to the clients.
+ /** \param network The id of the network to be removed.
*/
- void updateNetwork(const NetworkInfo &info);
+ void removeNetwork(NetworkId network);
- //! Remove identity and propagate that fact to the clients.
- /** \param identity The identity to be removed.
+ //! 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 removeNetwork(NetworkId network);
+ 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 scriptResult(QString result);
//! Identity has been created.
void networkRemoved(NetworkId);
private slots:
+ void removeClient(QIODevice *dev);
+
void recvStatusMsgFromServer(QString msg);
- void recvMessageFromServer(Message::Type, BufferInfo::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 scriptRequest(QString script);
+ void clientsConnected();
+ void clientsDisconnected();
+
+ void updateIdentityBySender();
+
private:
void loadSettings();
void initScriptEngine();
UserId _user;
SignalProxy *_signalProxy;
- QHash<NetworkId, NetworkConnection *> _connections;
- QHash<NetworkId, Network *> _networks;
- QHash<IdentityId, Identity *> _identities;
+ CoreAliasManager _aliasManager;
+ // QHash<NetworkId, NetworkConnection *> _connections;
+ QHash<NetworkId, CoreNetwork *> _networks;
+ // QHash<NetworkId, CoreNetwork *> _networksToRemove;
+ QHash<IdentityId, CoreIdentity *> _identities;
+
+ CoreBufferSyncer *_bufferSyncer;
+ CoreBacklogManager *_backlogManager;
+ CoreBufferViewManager *_bufferViewManager;
+ CoreIrcListHelper *_ircListHelper;
+ CoreCoreInfo _coreInfo;
QScriptEngine *scriptEngine;
projects / quassel.git / blobdiff