projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is the long-awaited monster commit, bringing you a redesigned core arch and...
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
9a64526
..
26e67cc
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-31,12
+31,16
@@
class BufferInfo;
class Message;
class Identity;
class Message;
class Identity;
-class Network
Info
;
+class Network;
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
+class BufferModel;
+class IrcUser;
+class IrcChannel;
+class NickModel;
class SignalProxy;
class QTimer;
class SignalProxy;
class QTimer;
@@
-50,15
+54,13
@@
public:
static void destroy();
static void init(AbstractUi *);
static void destroy();
static void init(AbstractUi *);
- static QList<Network
Info *> networkInfo
s();
- static Network
Info *networkInfo(uint
networkid);
+ static QList<Network
*> network
s();
+ static Network
*network(NetworkId
networkid);
static QList<BufferInfo> allBufferInfos();
static QList<Buffer *> buffers();
static QList<BufferInfo> allBufferInfos();
static QList<Buffer *> buffers();
- static Buffer *buffer(
uint
bufferUid);
+ static Buffer *buffer(
BufferId
bufferUid);
static Buffer *buffer(BufferInfo);
static Buffer *buffer(BufferInfo);
- static BufferInfo statusBufferInfo(QString net);
- static BufferInfo bufferInfo(QString net, QString buf);
static QList<IdentityId> identityIds();
static const Identity * identity(IdentityId);
static QList<IdentityId> identityIds();
static const Identity * identity(IdentityId);
@@
-81,14
+83,21
@@
public:
*/
static void removeIdentity(IdentityId id);
*/
static void removeIdentity(IdentityId id);
+ static void addNetwork(NetworkId id);
+ static void addNetwork(Network *);
+
+
static NetworkModel *networkModel();
static NetworkModel *networkModel();
+ static BufferModel *bufferModel();
+ static NickModel *nickModel();
static SignalProxy *signalProxy();
static AbstractUiMsg *layoutMsg(const Message &);
static bool isConnected();
static SignalProxy *signalProxy();
static AbstractUiMsg *layoutMsg(const Message &);
static bool isConnected();
+ static bool isSynced();
- static void fakeInput(
uint
bufferUid, QString message);
+ static void fakeInput(
BufferId
bufferUid, QString message);
static void fakeInput(BufferInfo bufferInfo, QString message);
static void storeSessionData(const QString &key, const QVariant &data);
static void fakeInput(BufferInfo bufferInfo, QString message);
static void storeSessionData(const QString &key, const QVariant &data);
@@
-100,18
+109,11
@@
public:
signals:
void sendInput(BufferInfo, QString message);
void showBuffer(Buffer *);
signals:
void sendInput(BufferInfo, QString message);
void showBuffer(Buffer *);
- void bufferSelected(Buffer *);
- void bufferUpdated(Buffer *);
- void bufferActivity(Buffer::ActivityLevel, Buffer *);
+ void bufferUpdated(BufferInfo bufferInfo);
void backlogReceived(Buffer *, QList<Message>);
void requestBacklog(BufferInfo, QVariant, QVariant);
void requestNetworkStates();
void backlogReceived(Buffer *, QList<Message>);
void requestBacklog(BufferInfo, QVariant, QVariant);
void requestNetworkStates();
- void recvPartialItem(uint avail, uint size);
- void coreConnectionError(QString errorMsg);
- void coreConnectionMsg(const QString &msg);
- void coreConnectionProgress(uint part, uint total);
-
void showConfigWizard(const QVariantMap &coredata);
void connected();
void showConfigWizard(const QVariantMap &coredata);
void connected();
@@
-144,27
+146,24
@@
signals:
public slots:
//void selectBuffer(Buffer *);
public slots:
//void selectBuffer(Buffer *);
- //void connectToLocalCore();
- void connectToCore(const QVariantMap &);
+
+ void setConnectedToCore(QIODevice *socket);
+ void setSyncedToCore();
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
+
private slots:
private slots:
- void recvCoreState(const QVariant &state);
void recvSessionData(const QString &key, const QVariant &data);
void recvSessionData(const QString &key, const QVariant &data);
- void coreSocketError(QAbstractSocket::SocketError);
- void coreHasData();
- void coreSocketConnected();
- void coreSocketDisconnected();
+ //void coreSocketError(QAbstractSocket::SocketError);
void userInput(BufferInfo, QString);
void userInput(BufferInfo, QString);
-
void networkConnected(uint
);
-
void networkDisconnected(uint
);
+
//void networkConnected(NetworkId
);
+
//void networkDisconnected(NetworkId
);
- void updateCoreConnectionProgress();
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
void recvBacklogData(BufferInfo, QVariantList, bool);
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
void recvBacklogData(BufferInfo, QVariantList, bool);
@@
-173,8
+172,7
@@
private slots:
void layoutMsg();
void bufferDestroyed();
void layoutMsg();
void bufferDestroyed();
- void networkInfoDestroyed();
- void ircChannelAdded(QString);
+ void networkDestroyed();
void coreIdentityCreated(const Identity &);
void coreIdentityRemoved(IdentityId);
void coreIdentityCreated(const Identity &);
void coreIdentityRemoved(IdentityId);
@@
-183,7
+181,7
@@
private:
virtual ~Client();
void init();
virtual ~Client();
void init();
- void syncToCore(const QVariant
&core
State);
+ void syncToCore(const QVariant
Map &session
State);
static QPointer<Client> instanceptr;
static QPointer<Client> instanceptr;
@@
-191,15
+189,15
@@
private:
QPointer<SignalProxy> _signalProxy;
QPointer<AbstractUi> mainUi;
QPointer<NetworkModel> _networkModel;
QPointer<SignalProxy> _signalProxy;
QPointer<AbstractUi> mainUi;
QPointer<NetworkModel> _networkModel;
+ QPointer<BufferModel> _bufferModel;
+ QPointer<NickModel> _nickModel;
ClientMode clientMode;
ClientMode clientMode;
- quint32 blockSize;
- bool connectedToCore;
+ bool _connectedToCore, _syncedToCore;
- QVariantMap coreConnectionInfo;
QHash<BufferId, Buffer *> _buffers;
QHash<BufferId, Buffer *> _buffers;
- QHash<NetworkId, Network
Info *> _networkInfo
;
+ QHash<NetworkId, Network
*> _networks
;
QHash<IdentityId, Identity *> _identities;
QTimer *layoutTimer;
QHash<IdentityId, Identity *> _identities;
QTimer *layoutTimer;
@@
-207,7
+205,7
@@
private:
QVariantMap sessionData;
QVariantMap sessionData;
-
+ friend class ClientSyncer;
};
#endif
};
#endif