projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more fixes
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
8b991bd
..
610e732
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-18,22
+18,23
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef
_
CLIENT_H_
-#define
_
CLIENT_H_
+#ifndef CLIENT_H_
+#define CLIENT_H_
#include <QAbstractSocket>
#include <QTcpSocket>
#include <QList>
#include <QPointer>
#include <QAbstractSocket>
#include <QTcpSocket>
#include <QList>
#include <QPointer>
-#include "buffer.h" // needed for activity lvl
+#include "bufferinfo.h"
+#include "types.h"
-class BufferInfo;
class Message;
class MessageModel;
class AbstractMessageProcessor;
class Identity;
class Message;
class MessageModel;
class AbstractMessageProcessor;
class Identity;
+class CertIdentity;
class Network;
class AbstractUi;
class Network;
class AbstractUi;
@@
-43,6
+44,7
@@
class BufferModel;
class BufferSyncer;
class ClientBacklogManager;
class ClientIrcListHelper;
class BufferSyncer;
class ClientBacklogManager;
class ClientIrcListHelper;
+class ClientSyncer;
class BufferViewManager;
class IrcUser;
class IrcChannel;
class BufferViewManager;
class IrcUser;
class IrcChannel;
@@
-61,24
+63,20
@@
public:
static Client *instance();
static void destroy();
static void init(AbstractUi *);
static Client *instance();
static void destroy();
static void init(AbstractUi *);
-
- static QList<BufferInfo> allBufferInfos();
- static QList<Buffer *> buffers();
- // static Buffer *buffer(BufferId bufferUid);
- static Buffer *buffer(BufferInfo);
+ static AbstractUi *mainUi();
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
static QList<IdentityId> identityIds();
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
static QList<IdentityId> identityIds();
- static const Identity *
identity(IdentityId);
+ static const Identity *identity(IdentityId);
//! Request creation of an identity with the given data.
/** The request will be sent to the core, and will be propagated back to all the clients
* with a new valid IdentityId.
* \param identity The identity template for the new identity. It does not need to have a valid ID.
*/
//! Request creation of an identity with the given data.
/** The request will be sent to the core, and will be propagated back to all the clients
* with a new valid IdentityId.
* \param identity The identity template for the new identity. It does not need to have a valid ID.
*/
- static void createIdentity(const Identity &identity);
+ static void createIdentity(const
Cert
Identity &identity);
//! Request update of an identity with the given data.
/** The request will be sent to the core, and will be propagated back to all the clients.
//! Request update of an identity with the given data.
/** The request will be sent to the core, and will be propagated back to all the clients.
@@
-116,12
+114,11
@@
public:
static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
static void removeBuffer(BufferId id);
static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
static void removeBuffer(BufferId id);
+ static void logMessage(QtMsgType type, const char *msg);
+ static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
+
signals:
void sendInput(BufferInfo, QString message);
signals:
void sendInput(BufferInfo, QString message);
- void showBuffer(Buffer *);
- void bufferUpdated(BufferInfo bufferInfo);
- void backlogReceived(Buffer *, QList<Message>);
- void requestBacklog(BufferInfo, QVariant, QVariant);
void requestNetworkStates();
void showConfigWizard(const QVariantMap &coredata);
void requestNetworkStates();
void showConfigWizard(const QVariantMap &coredata);
@@
-145,7
+142,7
@@
signals:
void identityRemoved(IdentityId id);
//! Sent to the core when an identity shall be created. Should not be used elsewhere.
void identityRemoved(IdentityId id);
//! Sent to the core when an identity shall be created. Should not be used elsewhere.
- void requestCreateIdentity(const Identity &);
+ void requestCreateIdentity(const Identity &
, const QVariantMap &
);
//! 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);
@@
-153,39
+150,35
@@
signals:
void networkRemoved(NetworkId id);
void requestCreateNetwork(const NetworkInfo &info);
void networkRemoved(NetworkId id);
void requestCreateNetwork(const NetworkInfo &info);
- void requestUpdateNetwork(const NetworkInfo &info);
void requestRemoveNetwork(NetworkId);
void requestRemoveNetwork(NetworkId);
+ void newClientSyncer(ClientSyncer *);
+
+ void logUpdated(const QString &msg);
+
public slots:
//void selectBuffer(Buffer *);
void disconnectFromCore();
public slots:
//void selectBuffer(Buffer *);
void disconnectFromCore();
- void setCoreConfiguration(const QVariantMap &settings);
-
void bufferRemoved(BufferId bufferId);
void bufferRenamed(BufferId bufferId, const QString &newName);
private slots:
void bufferRemoved(BufferId bufferId);
void bufferRenamed(BufferId bufferId, const QString &newName);
private slots:
- //void coreSocketError(QAbstractSocket::SocketError);
-
- //void networkConnected(NetworkId);
- //void networkDisconnected(NetworkId);
+ void disconnectedFromCore();
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
- void receiveBacklog(BufferId bufferId, const QVariantList &msgs);
- void updateBufferInfo(BufferInfo);
- void bufferDestroyed();
void networkDestroyed();
void coreIdentityCreated(const Identity &);
void coreIdentityRemoved(IdentityId);
void coreNetworkCreated(NetworkId);
void coreNetworkRemoved(NetworkId);
void networkDestroyed();
void coreIdentityCreated(const Identity &);
void coreIdentityRemoved(IdentityId);
void coreNetworkCreated(NetworkId);
void coreNetworkRemoved(NetworkId);
- void setConnectedToCore(
QIODevice *socket, AccountId id
);
+ void setConnectedToCore(
AccountId id, QIODevice *socket = 0
);
void setSyncedToCore();
void setSyncedToCore();
+ void requestInitialBacklog();
void setSecuredConnection();
void setSecuredConnection();
@@
-198,14
+191,10
@@
private:
static void setCurrentCoreAccount(AccountId);
static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
static void setCurrentCoreAccount(AccountId);
static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
- Buffer *statusBuffer(const NetworkId &networkid) const;
-
static QPointer<Client> instanceptr;
static QPointer<Client> instanceptr;
- QPointer<QIODevice> socket;
-
SignalProxy * _signalProxy;
SignalProxy * _signalProxy;
- AbstractUi * mainUi;
+ AbstractUi *
_
mainUi;
NetworkModel * _networkModel;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
NetworkModel * _networkModel;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
@@
-220,13
+209,14
@@
private:
bool _connectedToCore, _syncedToCore;
bool _connectedToCore, _syncedToCore;
- QHash<BufferId, Buffer *> _buffers;
- QHash<NetworkId, Buffer *> _statusBuffers; // fast lookup
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
static AccountId _currentCoreAccount;
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
static AccountId _currentCoreAccount;
+ QString _debugLogBuffer;
+ QTextStream _debugLog;
+
friend class ClientSyncer;
};
friend class ClientSyncer;
};