projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched client-side account data to using AccountId now rather than the account...
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
d6ae6c0
..
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();
@@
-145,8
+147,6
@@
signals:
public slots:
//void selectBuffer(Buffer *);
public slots:
//void selectBuffer(Buffer *);
- void setConnectedToCore(QIODevice *socket);
- void setSyncedToCore();
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
@@
-171,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();
@@
-178,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;
@@
-199,6
+204,8
@@
private:
QTimer *layoutTimer;
QList<Buffer *> layoutQueue;
QTimer *layoutTimer;
QList<Buffer *> layoutQueue;
+ static AccountId _currentCoreAccount;
+
friend class ClientSyncer;
};
friend class ClientSyncer;
};