projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Syncing my current state, Network settings still not fully functional, so don't use...
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
4df6685
..
95f30a3
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-42,6
+42,7
@@
class IrcUser;
class IrcChannel;
class NickModel;
class SignalProxy;
class IrcChannel;
class NickModel;
class SignalProxy;
+struct NetworkInfo;
class QTimer;
class QTimer;
@@
-83,9
+84,9
@@
public:
*/
static void removeIdentity(IdentityId id);
*/
static void removeIdentity(IdentityId id);
- static void
addNetwork(NetworkId id
);
- static void
addNetwork(Network *
);
-
+ static void
createNetwork(const NetworkInfo &info
);
+ static void
updateNetwork(const NetworkInfo &info
);
+ static void removeNetwork(NetworkId id);
static NetworkModel *networkModel();
static BufferModel *bufferModel();
static NetworkModel *networkModel();
static BufferModel *bufferModel();
@@
-103,6
+104,8
@@
public:
static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
static QStringList sessionDataKeys();
static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
static QStringList sessionDataKeys();
+ static void disconnectFromNetwork(NetworkId);
+
enum ClientMode { LocalCore, RemoteCore };
signals:
enum ClientMode { LocalCore, RemoteCore };
signals:
@@
-143,7
+146,12
@@
signals:
//! Sent to the core when an identity shall be removed. Should not be used elsewhere.
void requestRemoveIdentity(IdentityId);
//! Sent to the core when an identity shall be removed. Should not be used elsewhere.
void requestRemoveIdentity(IdentityId);
- void networkAdded(NetworkId id);
+ void networkCreated(NetworkId id);
+ void networkRemoved(NetworkId id);
+
+ void requestCreateNetwork(const NetworkInfo &info);
+ void requestUpdateNetwork(const NetworkInfo &info);
+ void requestRemoveNetwork(const NetworkInfo &info);
public slots:
//void selectBuffer(Buffer *);
public slots:
//void selectBuffer(Buffer *);
@@
-179,7
+187,7
@@
private:
virtual ~Client();
void init();
virtual ~Client();
void init();
-
void syncToCore(const QVariantMap &sessionState
);
+
static void addNetwork(Network *
);
static QPointer<Client> instanceptr;
static QPointer<Client> instanceptr;