projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes #522 - applied patch with minor changes
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
684cb58
..
3679d65
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-45,7
+45,7
@@
class BufferSyncer;
class ClientBacklogManager;
class ClientIrcListHelper;
class ClientSyncer;
class ClientBacklogManager;
class ClientIrcListHelper;
class ClientSyncer;
-class BufferViewManager;
+class
Client
BufferViewManager;
class IrcUser;
class IrcChannel;
class SignalProxy;
class IrcUser;
class IrcChannel;
class SignalProxy;
@@
-102,7
+102,7
@@
public:
static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
- static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+ static inline
Client
BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
static AccountId currentCoreAccount();
static AccountId currentCoreAccount();
@@
-129,7
+129,6
@@
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);
@@
-188,8
+187,6
@@
private slots:
void createDefaultBufferView();
void createDefaultIdentity();
void createDefaultNetworks();
void createDefaultBufferView();
void createDefaultIdentity();
void createDefaultNetworks();
- void setSecuredConnection();
-
private:
Client(QObject *parent = 0);
private:
Client(QObject *parent = 0);
@@
-208,7
+205,7
@@
private:
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
ClientBacklogManager *_backlogManager;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
ClientBacklogManager *_backlogManager;
- BufferViewManager *_bufferViewManager;
+
Client
BufferViewManager *_bufferViewManager;
ClientIrcListHelper *_ircListHelper;
MessageModel *_messageModel;
ClientIrcListHelper *_ircListHelper;
MessageModel *_messageModel;