projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move checkForHighlight() from Client to QtUiMessageProcessor.
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
f7e0dc0
..
112a6a2
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-30,29
+30,34
@@
class BufferInfo;
class Message;
class BufferInfo;
class Message;
+class MessageModel;
+class AbstractMessageProcessor;
class Identity;
class Network;
class Identity;
class Network;
-
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
class BufferModel;
class BufferSyncer;
class ClientBacklogManager;
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
public:
class Client : public QObject {
Q_OBJECT
public:
+ enum ClientMode {
+ LocalCore,
+ RemoteCore
+ };
+
static Client *instance();
static void destroy();
static void init(AbstractUi *);
static Client *instance();
static void destroy();
static void init(AbstractUi *);
@@
-93,22
+98,21
@@
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 AbstractMessageProcessor *messageProcessor() { return instance()->_messageProcessor; }
static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
+ static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
+ static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
static AccountId currentCoreAccount();
static AccountId currentCoreAccount();
- static AbstractUiMsg *layoutMsg(const Message &);
-
static bool isConnected();
static bool isSynced();
static void userInput(BufferInfo bufferInfo, QString message);
static bool isConnected();
static bool isSynced();
static void userInput(BufferInfo bufferInfo, QString message);
- enum ClientMode { LocalCore, RemoteCore };
-
- static void checkForHighlight(Message &msg);
static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
static void removeBuffer(BufferId id);
static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
static void removeBuffer(BufferId id);
@@
-123,6
+127,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);
@@
-175,8
+180,6
@@
private slots:
void updateBufferInfo(BufferInfo);
void updateLastSeenMsg(BufferId id, const MsgId &msgId);
void updateBufferInfo(BufferInfo);
void updateLastSeenMsg(BufferId id, const MsgId &msgId);
- void layoutMsg();
-
void bufferDestroyed();
void networkDestroyed();
void coreIdentityCreated(const Identity &);
void bufferDestroyed();
void networkDestroyed();
void coreIdentityCreated(const Identity &);
@@
-186,6
+189,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);
@@
-208,6
+213,11
@@
private:
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
ClientBacklogManager *_backlogManager;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
ClientBacklogManager *_backlogManager;
+ BufferViewManager *_bufferViewManager;
+ ClientIrcListHelper *_ircListHelper;
+
+ MessageModel *_messageModel;
+ AbstractMessageProcessor *_messageProcessor;
ClientMode clientMode;
ClientMode clientMode;
@@
-220,9
+230,6
@@
private:
Buffer *_monitorBuffer;
Buffer *_monitorBuffer;
- QTimer *layoutTimer;
- QList<Buffer *> layoutQueue;
-
static AccountId _currentCoreAccount;
friend class ClientSyncer;
static AccountId _currentCoreAccount;
friend class ClientSyncer;