projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preparing storage backend to store usermode and awaymessage for session restore
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
003a23d
..
3679d65
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-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;
@@
-90,7
+90,7
@@
public:
*/
static void removeIdentity(IdentityId id);
*/
static void removeIdentity(IdentityId id);
- static void createNetwork(const NetworkInfo &info);
+ static void createNetwork(const NetworkInfo &info
, const QStringList &persistentChannels = QStringList()
);
static void updateNetwork(const NetworkInfo &info);
static void removeNetwork(NetworkId id);
static void updateNetwork(const NetworkInfo &info);
static void removeNetwork(NetworkId id);
@@
-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);
@@
-154,7
+153,7
@@
signals:
void networkCreated(NetworkId id);
void networkRemoved(NetworkId id);
void networkCreated(NetworkId id);
void networkRemoved(NetworkId id);
- void requestCreateNetwork(const NetworkInfo &info);
+ void requestCreateNetwork(const NetworkInfo &info
, const QStringList &persistentChannels = QStringList()
);
void requestRemoveNetwork(NetworkId);
void newClientSyncer(ClientSyncer *);
void requestRemoveNetwork(NetworkId);
void newClientSyncer(ClientSyncer *);
@@
-185,10
+184,9
@@
private slots:
void setConnectedToCore(AccountId id, QIODevice *socket = 0);
void setSyncedToCore();
void requestInitialBacklog();
void setConnectedToCore(AccountId id, QIODevice *socket = 0);
void setSyncedToCore();
void requestInitialBacklog();
- void createDefautBufferView();
+ void createDefau
l
tBufferView();
void createDefaultIdentity();
void createDefaultIdentity();
- void setSecuredConnection();
-
+ void createDefaultNetworks();
private:
Client(QObject *parent = 0);
private:
Client(QObject *parent = 0);
@@
-207,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;