projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The Core Configuration Wizard is back! teH rul!
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
220e8c8
..
40bf332
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-92,6
+92,8
@@
public:
static BufferModel *bufferModel();
static SignalProxy *signalProxy();
static BufferModel *bufferModel();
static SignalProxy *signalProxy();
+ static AccountId currentCoreAccount();
+
static AbstractUiMsg *layoutMsg(const Message &);
static bool isConnected();
static AbstractUiMsg *layoutMsg(const Message &);
static bool isConnected();
@@
-99,10
+101,6
@@
public:
static void userInput(BufferInfo bufferInfo, QString message);
static void userInput(BufferInfo bufferInfo, QString message);
- static void storeSessionData(const QString &key, const QVariant &data);
- static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
- static QStringList sessionDataKeys();
-
enum ClientMode { LocalCore, RemoteCore };
signals:
enum ClientMode { LocalCore, RemoteCore };
signals:
@@
-119,10
+117,6
@@
signals:
void disconnected();
void coreConnectionStateChanged(bool);
void disconnected();
void coreConnectionStateChanged(bool);
- void sessionDataChanged(const QString &key);
- void sessionDataChanged(const QString &key, const QVariant &data);
- void sendSessionData(const QString &key, const QVariant &data);
-
//! The identity with the given ID has been newly created in core and client.
/** \param id The ID of the newly created identity.
*/
//! The identity with the given ID has been newly created in core and client.
/** \param id The ID of the newly created identity.
*/
@@
-153,15
+147,11
@@
signals:
public slots:
//void selectBuffer(Buffer *);
public slots:
//void selectBuffer(Buffer *);
- void setConnectedToCore(QIODevice *socket);
- void setSyncedToCore();
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
private slots:
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
private slots:
- void recvSessionData(const QString &key, const QVariant &data);
-
//void coreSocketError(QAbstractSocket::SocketError);
//void networkConnected(NetworkId);
//void coreSocketError(QAbstractSocket::SocketError);
//void networkConnected(NetworkId);
@@
-181,6
+171,9
@@
private slots:
void coreNetworkCreated(NetworkId);
void coreNetworkRemoved(NetworkId);
void coreNetworkCreated(NetworkId);
void coreNetworkRemoved(NetworkId);
+ void setConnectedToCore(QIODevice *socket, AccountId id);
+ void setSyncedToCore();
+
private:
Client(QObject *parent = 0);
virtual ~Client();
private:
Client(QObject *parent = 0);
virtual ~Client();
@@
-188,6
+181,8
@@
private:
static void addNetwork(Network *);
static void addNetwork(Network *);
+ static void setCurrentCoreAccount(AccountId);
+
static QPointer<Client> instanceptr;
QPointer<QIODevice> socket;
static QPointer<Client> instanceptr;
QPointer<QIODevice> socket;
@@
-209,7
+204,7
@@
private:
QTimer *layoutTimer;
QList<Buffer *> layoutQueue;
QTimer *layoutTimer;
QList<Buffer *> layoutQueue;
-
QVariantMap sessionData
;
+
static AccountId _currentCoreAccount
;
friend class ClientSyncer;
};
friend class ClientSyncer;
};