projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalProxy will no longer attempt to deliver data types unknown to Qt's MetaSystem
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
1c8924a
..
943063b
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-37,7
+37,7
@@
class CoreSession : public QObject {
Q_OBJECT
public:
Q_OBJECT
public:
- CoreSession(UserId, QObject *parent = 0);
+ CoreSession(UserId,
bool restoreState,
QObject *parent = 0);
~CoreSession();
QList<BufferInfo> buffers() const;
~CoreSession();
QList<BufferInfo> buffers() const;
@@
-56,8
+56,8
@@
public:
void attachNetworkConnection(NetworkConnection *conn);
//! Return necessary data for restoring the session after restarting the core
void attachNetworkConnection(NetworkConnection *conn);
//! Return necessary data for restoring the session after restarting the core
-
QVariant s
tate() const;
- void restoreS
tate(const QVariant &previousState
);
+
void saveSessionS
tate() const;
+ void restoreS
essionState(
);
public slots:
//! Store a piece session-wide data and distribute it to connected clients.
public slots:
//! Store a piece session-wide data and distribute it to connected clients.
@@
-69,6
+69,7
@@
public slots:
void connectToNetwork(QString, const QVariant &previousState = QVariant());
void connectToNetwork(NetworkId, const QVariant &previousState = QVariant());
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 processSignal(ClientSignal, QVariant, QVariant, QVariant);
void sendBacklog(BufferInfo, QVariant, QVariant);
@@
-122,8
+123,8
@@
signals:
private slots:
void recvStatusMsgFromServer(QString msg);
void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
private slots:
void recvStatusMsgFromServer(QString msg);
void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
- void networkConnected(
uint
networkid);
- void networkDisconnected(
uint
networkid);
+ 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.
//! Called when storage updated a BufferInfo.
/** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.