projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update genversion and Global to use version.dist
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
fad53ac
..
ad5740c
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-30,17
+30,19
@@
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 ClientBacklogManager;
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
class BufferModel;
class BufferSyncer;
class ClientBacklogManager;
+class ClientIrcListHelper;
+class BufferViewManager;
class IrcUser;
class IrcChannel;
class SignalProxy;
class IrcUser;
class IrcChannel;
class SignalProxy;
@@
-48,7
+50,6
@@
struct NetworkInfo;
class QTimer;
class QTimer;
-
class Client : public QObject {
Q_OBJECT
class Client : public QObject {
Q_OBJECT
@@
-93,10
+94,13
@@
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 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 AbstractUiMsg *layoutMsg(const Message &);
static AccountId currentCoreAccount();
static AbstractUiMsg *layoutMsg(const Message &);
@@
-124,6
+128,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);
@@
-187,6
+192,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);
@@
-209,6
+216,10
@@
private:
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
ClientBacklogManager *_backlogManager;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
ClientBacklogManager *_backlogManager;
+ BufferViewManager *_bufferViewManager;
+ ClientIrcListHelper *_ircListHelper;
+
+ MessageModel *_messageModel;
ClientMode clientMode;
ClientMode clientMode;
@@
-222,7
+233,7
@@
private:
Buffer *_monitorBuffer;
QTimer *layoutTimer;
Buffer *_monitorBuffer;
QTimer *layoutTimer;
- QList<Buffer *> layoutQueue;
+ QLi
nkedLi
st<Buffer *> layoutQueue;
static AccountId _currentCoreAccount;
static AccountId _currentCoreAccount;