projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Post-merge cleanups, remove the old message handling
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
4d1bad6
..
7c42784
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-30,24
+30,24
@@
class BufferInfo;
class Message;
class BufferInfo;
class Message;
+class MessageModel;
class Identity;
class Network;
class Identity;
class Network;
-
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
class BufferModel;
class BufferSyncer;
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
class BufferModel;
class BufferSyncer;
+class ClientBacklogManager;
+class ClientIrcListHelper;
+class BufferViewManager;
class IrcUser;
class IrcChannel;
class SignalProxy;
struct NetworkInfo;
class IrcUser;
class IrcChannel;
class SignalProxy;
struct NetworkInfo;
-class QTimer;
-
-
class Client : public QObject {
Q_OBJECT
class Client : public QObject {
Q_OBJECT
@@
-92,11
+92,14
@@
public:
static inline NetworkModel *networkModel() { return instance()->_networkModel; }
static inline BufferModel *bufferModel() { return instance()->_bufferModel; }
static inline NetworkModel *networkModel() { return instance()->_networkModel; }
static inline BufferModel *bufferModel() { return instance()->_bufferModel; }
+ static inline MessageModel *messageModel() { return instance()->_messageModel; }
static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
- static AccountId currentCoreAccount();
+ static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
+ static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
+ static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
- static A
bstractUiMsg *layoutMsg(const Message &
);
+ static A
ccountId currentCoreAccount(
);
static bool isConnected();
static bool isSynced();
static bool isConnected();
static bool isSynced();
@@
-106,7
+109,7
@@
public:
enum ClientMode { LocalCore, RemoteCore };
static void checkForHighlight(Message &msg);
enum ClientMode { LocalCore, RemoteCore };
static void checkForHighlight(Message &msg);
- static void setBufferLastSeen
(BufferId id, const QDateTime &seen
); // this is synced to core and other clients
+ static void setBufferLastSeen
Msg(BufferId id, const MsgId &msgId
); // this is synced to core and other clients
static void removeBuffer(BufferId id);
signals:
static void removeBuffer(BufferId id);
signals:
@@
-120,6
+123,7
@@
signals:
void showConfigWizard(const QVariantMap &coredata);
void connected();
void showConfigWizard(const QVariantMap &coredata);
void connected();
+ void securedConnection();
void disconnected();
void coreConnectionStateChanged(bool);
void disconnected();
void coreConnectionStateChanged(bool);
@@
-168,11
+172,9
@@
private slots:
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
- void rec
vBacklogData(BufferInfo, QVariantList, bool
);
+ void rec
eiveBacklog(BufferId bufferId, const QVariantList &msgs
);
void updateBufferInfo(BufferInfo);
void updateBufferInfo(BufferInfo);
- void updateLastSeen(BufferId id, const QDateTime &lastSeen);
-
- void layoutMsg();
+ void updateLastSeenMsg(BufferId id, const MsgId &msgId);
void bufferDestroyed();
void networkDestroyed();
void bufferDestroyed();
void networkDestroyed();
@@
-183,6
+185,8
@@
private slots:
void setConnectedToCore(QIODevice *socket, AccountId id);
void setSyncedToCore();
void setConnectedToCore(QIODevice *socket, AccountId id);
void setSyncedToCore();
+ void setSecuredConnection();
+
private:
Client(QObject *parent = 0);
private:
Client(QObject *parent = 0);
@@
-204,6
+208,11
@@
private:
NetworkModel * _networkModel;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
NetworkModel * _networkModel;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
+ ClientBacklogManager *_backlogManager;
+ BufferViewManager *_bufferViewManager;
+ ClientIrcListHelper *_ircListHelper;
+
+ MessageModel *_messageModel;
ClientMode clientMode;
ClientMode clientMode;
@@
-216,9
+225,6
@@
private:
Buffer *_monitorBuffer;
Buffer *_monitorBuffer;
- QTimer *layoutTimer;
- QList<Buffer *> layoutQueue;
-
static AccountId _currentCoreAccount;
friend class ClientSyncer;
static AccountId _currentCoreAccount;
friend class ClientSyncer;