projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cmake'
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
a52e039
..
913f630
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-27,9
+27,11
@@
#include "message.h"
class BufferSyncer;
#include "message.h"
class BufferSyncer;
+class CoreBacklogManager;
+class CoreBufferViewManager;
class Identity;
class NetworkConnection;
class Identity;
class NetworkConnection;
-class Network;
+class
Core
Network;
struct NetworkInfo;
class SignalProxy;
struct NetworkInfo;
class SignalProxy;
@@
-44,7
+46,7
@@
public:
QList<BufferInfo> buffers() const;
UserId user() const;
QList<BufferInfo> buffers() const;
UserId user() const;
- Network *network(NetworkId) const;
+
Core
Network *network(NetworkId) const;
NetworkConnection *networkConnection(NetworkId) const;
Identity *identity(IdentityId) const;
NetworkConnection *networkConnection(NetworkId) const;
Identity *identity(IdentityId) const;
@@
-63,12
+65,9
@@
public slots:
void addClient(QObject *socket);
void addClient(QObject *socket);
- void connectToNetwork(QString, const QVariant &previousState = QVariant());
- void connectToNetwork(NetworkId, const QVariant &previousState = QVariant());
+ void connectToNetwork(NetworkId);
void disconnectFromNetwork(NetworkId id);
void disconnectFromNetwork(NetworkId id);
- //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
- void sendBacklog(BufferInfo, QVariant, QVariant);
void msgFromClient(BufferInfo, QString message);
//! Create an identity and propagate the changes to the clients.
void msgFromClient(BufferInfo, QString message);
//! Create an identity and propagate the changes to the clients.
@@
-114,7
+113,11
@@
public slots:
* emits bufferRenamed(bufferId, newName) on success.
*/
void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
* emits bufferRenamed(bufferId, newName) on success.
*/
void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
-
+
+ void channelJoined(NetworkId id, const QString &channel, const QString &key = QString());
+ void channelParted(NetworkId, const QString &channel);
+ QHash<QString, QString> persistentChannels(NetworkId) const;
+
signals:
void initialized();
signals:
void initialized();
@@
-125,8
+128,6
@@
signals:
//void connectToIrc(QString net);
//void disconnectFromIrc(QString net);
//void connectToIrc(QString net);
//void disconnectFromIrc(QString net);
- void backlogData(BufferInfo, QVariantList, bool done);
-
void bufferInfoUpdated(BufferInfo);
void scriptResult(QString result);
void bufferInfoUpdated(BufferInfo);
void scriptResult(QString result);
@@
-149,8
+150,10
@@
signals:
void bufferRenamed(BufferId, QString);
private slots:
void bufferRenamed(BufferId, QString);
private slots:
+ void removeClient(QIODevice *dev);
+
void recvStatusMsgFromServer(QString msg);
void recvStatusMsgFromServer(QString msg);
- void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "",
quint8
flags = Message::None);
+ void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "",
Message::Flags
flags = Message::None);
void networkConnected(NetworkId networkid);
void networkDisconnected(NetworkId networkid);
void networkConnected(NetworkId networkid);
void networkDisconnected(NetworkId networkid);
@@
-163,7
+166,7
@@
private slots:
*/
void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
*/
void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
- void storeBufferLastSeen
(BufferId buffer, const QDateTime &lastSeen
);
+ void storeBufferLastSeen
Msg(BufferId buffer, const MsgId &msgId
);
void scriptRequest(QString script);
void scriptRequest(QString script);
@@
-175,11
+178,13
@@
private:
SignalProxy *_signalProxy;
QHash<NetworkId, NetworkConnection *> _connections;
SignalProxy *_signalProxy;
QHash<NetworkId, NetworkConnection *> _connections;
- QHash<NetworkId, Network *> _networks;
-
QHash<NetworkId,
Network *> _networksToRemove;
+ QHash<NetworkId,
Core
Network *> _networks;
+
// QHash<NetworkId, Core
Network *> _networksToRemove;
QHash<IdentityId, Identity *> _identities;
BufferSyncer *_bufferSyncer;
QHash<IdentityId, Identity *> _identities;
BufferSyncer *_bufferSyncer;
+ CoreBacklogManager *_backlogManager;
+ CoreBufferViewManager *_bufferViewManager;
QScriptEngine *scriptEngine;
QScriptEngine *scriptEngine;