* 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;
-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;
SignalProxy *signalProxy() const;
+ 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
public slots:
void networkStateRequested();
- void addClient(QObject *socket);
+ void addClient(QIODevice *device);
+ void addClient(SignalProxy *proxy);
void connectToNetwork(NetworkId);
void disconnectFromNetwork(NetworkId id);
- 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.
- */
- void updateIdentity(const Identity &identity);
-
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
*/
*/
void createNetwork(const NetworkInfo &info);
- //! 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.
*/
signals:
void initialized();
+ void sessionState(const QVariant &);
//void msgFromGui(uint netid, QString buf, QString message);
void displayMsg(Message message);
//void connectToIrc(QString net);
//void disconnectFromIrc(QString net);
- void backlogData(BufferInfo, QVariantList, bool done);
-
void bufferInfoUpdated(BufferInfo);
void scriptResult(QString result);
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 = "", quint8 flags = Message::None);
+ 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);
+ void identityUpdated(const QVariantMap &);
+
//! 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)
void scriptRequest(QString script);
+ void clientsConnected();
+ void clientsDisconnected();
+
private:
void loadSettings();
void initScriptEngine();
UserId _user;
SignalProxy *_signalProxy;
+ CoreAliasManager _aliasManager;
QHash<NetworkId, NetworkConnection *> _connections;
- QHash<NetworkId, Network *> _networks;
- QHash<NetworkId, Network *> _networksToRemove;
+ QHash<NetworkId, CoreNetwork *> _networks;
+ // QHash<NetworkId, CoreNetwork *> _networksToRemove;
QHash<IdentityId, Identity *> _identities;
BufferSyncer *_bufferSyncer;
+ CoreBacklogManager *_backlogManager;
+ CoreBufferViewManager *_bufferViewManager;
+ CoreIrcListHelper *_ircListHelper;
+ CoreCoreInfo _coreInfo;
QScriptEngine *scriptEngine;