projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Networks can now be removed even when they're connected.
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
1249a86
..
51c14a7
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-27,7
+27,7
@@
#include "message.h"
class Identity;
#include "message.h"
class Identity;
-class NetworkConnection;
// FIXME get rid of
+class NetworkConnection;
class Network;
struct NetworkInfo;
class SignalProxy;
class Network;
struct NetworkInfo;
class SignalProxy;
@@
-49,9
+49,6
@@
public:
QVariant sessionState();
QVariant sessionState();
- //! Retrieve a piece of session-wide data.
- QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
-
SignalProxy *signalProxy() const;
void attachNetworkConnection(NetworkConnection *conn);
SignalProxy *signalProxy() const;
void attachNetworkConnection(NetworkConnection *conn);
@@
-61,9
+58,6
@@
public:
void restoreSessionState();
public slots:
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 networkStateRequested();
void addClient(QObject *socket);
@@
-94,7
+88,7
@@
public slots:
//! Create a network and propagate the changes to the clients.
/** \param info The network's settings.
*/
//! Create a network and propagate the changes to the clients.
/** \param info The network's settings.
*/
- void createNetwork(const NetworkInfo &info
, bool useId = false
);
+ void createNetwork(const NetworkInfo &info);
//! Update a network and propagate the changes to the clients.
/** \param info The updated network settings.
//! Update a network and propagate the changes to the clients.
/** \param info The updated network settings.
@@
-119,8
+113,6
@@
signals:
void backlogData(BufferInfo, QVariantList, bool done);
void bufferInfoUpdated(BufferInfo);
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);
void scriptResult(QString result);
@@
-141,10
+133,12
@@
signals:
private slots:
void recvStatusMsgFromServer(QString msg);
private slots:
void recvStatusMsgFromServer(QString msg);
- void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+ void recvMessageFromServer(Message::Type,
BufferInfo::Type,
QString target, QString text, QString sender = "", quint8 flags = Message::None);
void networkConnected(NetworkId networkid);
void networkDisconnected(NetworkId networkid);
void networkConnected(NetworkId networkid);
void networkDisconnected(NetworkId networkid);
+ void destroyNetwork(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)
//! 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)
@@
-163,10
+157,9
@@
private:
SignalProxy *_signalProxy;
QHash<NetworkId, NetworkConnection *> _connections;
QHash<NetworkId, Network *> _networks;
SignalProxy *_signalProxy;
QHash<NetworkId, NetworkConnection *> _connections;
QHash<NetworkId, Network *> _networks;
+ QHash<NetworkId, Network *> _networksToRemove;
QHash<IdentityId, Identity *> _identities;
QHash<IdentityId, Identity *> _identities;
- QVariantMap sessionData;
-
QScriptEngine *scriptEngine;
};
QScriptEngine *scriptEngine;
};