projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Making channel names clickable
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
b8faf9f
..
40949ac
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-62,6
+62,7
@@
public:
static Client *instance();
static void destroy();
static void init(AbstractUi *);
static Client *instance();
static void destroy();
static void init(AbstractUi *);
+ static AbstractUi *mainUi();
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
@@
-112,6
+113,9
@@
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);
void requestNetworkStates();
signals:
void sendInput(BufferInfo, QString message);
void requestNetworkStates();
@@
-149,6
+153,8
@@
signals:
void newClientSyncer(ClientSyncer *);
void newClientSyncer(ClientSyncer *);
+ void logUpdated(const QString &msg);
+
public slots:
//void selectBuffer(Buffer *);
public slots:
//void selectBuffer(Buffer *);
@@
-169,9
+175,9
@@
private slots:
void coreNetworkCreated(NetworkId);
void coreNetworkRemoved(NetworkId);
void coreNetworkCreated(NetworkId);
void coreNetworkRemoved(NetworkId);
- void setConnectedToCore(QIODevice *socket, AccountId id);
- void setConnectedToInternalCore();
+ void setConnectedToCore(AccountId id, QIODevice *socket = 0);
void setSyncedToCore();
void setSyncedToCore();
+ void requestInitialBacklog();
void setSecuredConnection();
void setSecuredConnection();
@@
-187,7
+193,7
@@
private:
static QPointer<Client> instanceptr;
SignalProxy * _signalProxy;
static QPointer<Client> instanceptr;
SignalProxy * _signalProxy;
- AbstractUi * mainUi;
+ AbstractUi *
_
mainUi;
NetworkModel * _networkModel;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
NetworkModel * _networkModel;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
@@
-207,6
+213,9
@@
private:
static AccountId _currentCoreAccount;
static AccountId _currentCoreAccount;
+ QString _debugLogBuffer;
+ QTextStream _debugLog;
+
friend class ClientSyncer;
};
friend class ClientSyncer;
};