projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
another tiny commit: made keyboardselections in the buffermodel to span over the...
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
32e34ec
..
27417e5
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-28,7
+28,7
@@
#include "message.h"
class Identity;
#include "message.h"
class Identity;
-class
Server
;
+class
NetworkConnection
;
class SignalProxy;
class Storage;
class SignalProxy;
class Storage;
@@
-51,7
+51,7
@@
public:
SignalProxy *signalProxy() const;
SignalProxy *signalProxy() const;
- void attach
Server(Server *server
);
+ void attach
NetworkConnection(NetworkConnection *conn
);
//! Return necessary data for restoring the session after restarting the core
QVariant state() const;
//! Return necessary data for restoring the session after restarting the core
QVariant state() const;
@@
-61,7
+61,7
@@
public slots:
//! Store a piece session-wide data and distribute it to connected clients.
void storeSessionData(const QString &key, const QVariant &data);
//! Store a piece session-wide data and distribute it to connected clients.
void storeSessionData(const QString &key, const QVariant &data);
- void
server
StateRequested();
+ void
network
StateRequested();
void addClient(QIODevice *connection);
void addClient(QIODevice *connection);
@@
-72,10
+72,15
@@
public slots:
void sendBacklog(BufferInfo, QVariant, QVariant);
void msgFromGui(BufferInfo, QString message);
void sendBacklog(BufferInfo, QVariant, QVariant);
void msgFromGui(BufferInfo, QString message);
- //! Create
or update
an identity and propagate the changes to the clients.
- /** \param identity The identity to be created
/updated
.
+ //! Create an identity and propagate the changes to the clients.
+ /** \param identity The identity to be created.
*/
*/
- void createOrUpdateIdentity(const Identity &identity);
+ 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.
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
@@
-113,8
+118,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
server
Connected(uint networkid);
- void
server
Disconnected(uint networkid);
+ void
network
Connected(uint networkid);
+ void
network
Disconnected(uint networkid);
void scriptRequest(QString script);
void scriptRequest(QString script);
@@
-125,7
+130,7
@@
private:
SignalProxy *_signalProxy;
Storage *storage;
SignalProxy *_signalProxy;
Storage *storage;
- QHash<NetworkId,
Server *> server
s;
+ QHash<NetworkId,
NetworkConnection *> connection
s;
QVariantMap sessionData;
QMutex mutex;
QVariantMap sessionData;
QMutex mutex;