projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finishing the renaming of the BufferTreeView, since SVN doesn't allow
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
73204f6
..
33b09d7
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-1,11
+1,11
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-07 by
The Quassel IRC Development Team
*
+ * Copyright (C) 2005-07 by
the Quassel IRC Team
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
- * (at your option)
any later version.
*
+ * (at your option)
version 3.
*
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
@@
-25,78
+25,89
@@
#include <QString>
#include <QVariant>
#include <QString>
#include <QVariant>
-//#include "coreproxy.h"
#include "message.h"
class Server;
class SignalProxy;
class Storage;
#include "message.h"
class Server;
class SignalProxy;
class Storage;
+class QScriptEngine;
+
class CoreSession : public QObject {
Q_OBJECT
class CoreSession : public QObject {
Q_OBJECT
- public:
- CoreSession(UserId, Storage *, QObject *parent = 0);
- ~CoreSession();
+public:
+ CoreSession(UserId, Storage *, QObject *parent = 0);
+ virtual ~CoreSession();
+
+ NetworkId getNetworkId(const QString &network) const;
+ QList<BufferInfo> buffers() const;
+ UserId userId() const;
+ QVariant sessionState();
- QList<BufferId> buffers() const;
- UserId userId() const;
- QVariant sessionState();
+ //! Retrieve a piece of session-wide data.
+ QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
- public slots:
- //! Store a piece session-wide data and distribute it to connected clients.
- void storeSessionData(const QString &key, const QVariant &data);
+ SignalProxy *signalProxy() const;
-
void addClient(QIODevice *connection
);
+
void attachServer(Server *server
);
- public:
- //! Retrieve a piece of session-wide data.
-
QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant()
);
+ //! Return necessary data for restoring the session after restarting the core
+ QVariant state() const;
+
void restoreState(const QVariant &previousState
);
- //CoreProxy *proxy();
- SignalProxy *signalProxy() const;
+public slots:
+ //! Store a piece session-wide data and distribute it to connected clients.
+ void storeSessionData(const QString &key, const QVariant &data);
- public slots:
- void connectToNetwork(QString);
- //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
- void sendBacklog(BufferId, QVariant, QVariant);
- void msgFromGui(BufferId, QString message);
- void sendServerStates();
+ void serverStateRequested();
- signals:
- //void proxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
+ void addClient(QIODevice *connection);
- void msgFromGui(QString net, QString buf, QString message);
- void displayMsg(Message message);
- void displayStatusMsg(QString, QString);
+ void connectToNetwork(QString, const QVariant &previousState = QVariant());
+ //void connectToNetwork(NetworkId);
-
void connectToIrc(QString ne
t);
-
void disconnectFromIrc(QString ne
t);
-
void serverStateRequested(
);
+
//void processSignal(ClientSignal, QVariant, QVariant, QVarian
t);
+
void sendBacklog(BufferInfo, QVariant, QVarian
t);
+
void msgFromGui(BufferInfo, QString message
);
- void backlogData(BufferId, QVariantList, bool done);
+signals:
+ void msgFromGui(uint netid, QString buf, QString message);
+ void displayMsg(Message message);
+ void displayStatusMsg(QString, QString);
- void bufferIdUpdated(BufferId);
- void sessionDataChanged(const QString &key);
- void sessionDataChanged(const QString &key, const QVariant &data);
+ void connectToIrc(QString net);
+ void disconnectFromIrc(QString net);
- private slots:
- void recvStatusMsgFromServer(QString msg);
- void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
- void serverConnected(QString net);
- void serverDisconnected(QString net);
+ void backlogData(BufferInfo, QVariantList, bool done);
- private:
- UserId user;
+ void bufferInfoUpdated(BufferInfo);
+ void sessionDataChanged(const QString &key);
+ void sessionDataChanged(const QString &key, const QVariant &data);
- //CoreProxy *coreProxy;
- SignalProxy *_signalProxy;
- Storage *storage;
- QHash<QString, Server *> servers;
+ void scriptResult(QString result);
+
+private slots:
+ void recvStatusMsgFromServer(QString msg);
+ void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+ void serverConnected(uint networkid);
+ void serverDisconnected(uint networkid);
- QVariantMap sessionData;
- QMutex mutex;
+ void scriptRequest(QString script);
+
+private:
+ void initScriptEngine();
+
+ UserId user;
+
+ SignalProxy *_signalProxy;
+ Storage *storage;
+ QHash<NetworkId, Server *> servers;
+
+ QVariantMap sessionData;
+ QMutex mutex;
+ QScriptEngine *scriptEngine;
};
#endif
};
#endif