projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignanlProxy does no longer try to write to closed devices. Also closed devices can...
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
7dd03c4
..
91ad27e
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-48,7
+48,7
@@
public:
~CoreSession();
QList<BufferInfo> buffers() const;
~CoreSession();
QList<BufferInfo> buffers() const;
- UserId user() const;
+ inline UserId user() const { return _user; }
CoreNetwork *network(NetworkId) const;
NetworkConnection *networkConnection(NetworkId) const;
Identity *identity(IdentityId) const;
CoreNetwork *network(NetworkId) const;
NetworkConnection *networkConnection(NetworkId) const;
Identity *identity(IdentityId) const;
@@
-71,7
+71,8
@@
public:
public slots:
void networkStateRequested();
public slots:
void networkStateRequested();
- void addClient(QObject *socket);
+ void addClient(QIODevice *device);
+ void addClient(SignalProxy *proxy);
void connectToNetwork(NetworkId);
void disconnectFromNetwork(NetworkId id);
void connectToNetwork(NetworkId);
void disconnectFromNetwork(NetworkId id);
@@
-93,11
+94,6
@@
public slots:
*/
void createNetwork(const NetworkInfo &info);
*/
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.
*/
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
*/
@@
-123,6
+119,7
@@
public slots:
signals:
void initialized();
signals:
void initialized();
+ void sessionState(const QVariant &);
//void msgFromGui(uint netid, QString buf, QString message);
void displayMsg(Message message);
//void msgFromGui(uint netid, QString buf, QString message);
void displayMsg(Message message);
@@
-163,7
+160,6
@@
private slots:
void destroyNetwork(NetworkId);
void identityUpdated(const QVariantMap &);
void destroyNetwork(NetworkId);
void identityUpdated(const QVariantMap &);
- //void networkUpdated(const QVariantMap &);
//! Called when storage updated a BufferInfo.
/** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.
//! Called when storage updated a BufferInfo.
/** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.
@@
-176,6
+172,9
@@
private slots:
void scriptRequest(QString script);
void scriptRequest(QString script);
+ void clientsConnected();
+ void clientsDisconnected();
+
private:
void loadSettings();
void initScriptEngine();
private:
void loadSettings();
void initScriptEngine();