projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
making use of postgres timestamps
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
610e732
..
3dd5b6a
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-43,9
+43,10
@@
class NetworkModel;
class BufferModel;
class BufferSyncer;
class ClientBacklogManager;
class BufferModel;
class BufferSyncer;
class ClientBacklogManager;
+class ClientBufferViewManager;
class ClientIrcListHelper;
class ClientSyncer;
class ClientIrcListHelper;
class ClientSyncer;
-class
BufferViewManag
er;
+class
ClientUserInputHandl
er;
class IrcUser;
class IrcChannel;
class SignalProxy;
class IrcUser;
class IrcChannel;
class SignalProxy;
@@
-90,7
+91,7
@@
public:
*/
static void removeIdentity(IdentityId id);
*/
static void removeIdentity(IdentityId id);
- static void createNetwork(const NetworkInfo &info);
+ static void createNetwork(const NetworkInfo &info
, const QStringList &persistentChannels = QStringList()
);
static void updateNetwork(const NetworkInfo &info);
static void removeNetwork(NetworkId id);
static void updateNetwork(const NetworkInfo &info);
static void removeNetwork(NetworkId id);
@@
-102,29
+103,34
@@
public:
static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
- static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+ static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+ static inline ClientUserInputHandler *inputHandler() { return instance()->_inputHandler; }
static AccountId currentCoreAccount();
static bool isConnected();
static bool isSynced();
static AccountId currentCoreAccount();
static bool isConnected();
static bool isSynced();
+ static inline bool internalCore() { return instance()->_internalCore; }
- static void userInput(
BufferInfo bufferInfo, QString
message);
+ static void userInput(
const BufferInfo &bufferInfo, const QString &
message);
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 renameBuffer(BufferId bufferId, const QString &newName);
+ static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2);
+ static void purgeKnownBufferIds();
static void logMessage(QtMsgType type, const char *msg);
static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
static void logMessage(QtMsgType type, const char *msg);
static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
+ static inline void registerClientSyncer(ClientSyncer *syncer) { emit instance()->newClientSyncer(syncer); }
+
signals:
signals:
- void sendInput(BufferInfo, QString message);
void requestNetworkStates();
void showConfigWizard(const QVariantMap &coredata);
void connected();
void requestNetworkStates();
void showConfigWizard(const QVariantMap &coredata);
void connected();
- void securedConnection();
void disconnected();
void coreConnectionStateChanged(bool);
void disconnected();
void coreConnectionStateChanged(bool);
@@
-149,7
+155,7
@@
signals:
void networkCreated(NetworkId id);
void networkRemoved(NetworkId id);
void networkCreated(NetworkId id);
void networkRemoved(NetworkId id);
- void requestCreateNetwork(const NetworkInfo &info);
+ void requestCreateNetwork(const NetworkInfo &info
, const QStringList &persistentChannels = QStringList()
);
void requestRemoveNetwork(NetworkId);
void newClientSyncer(ClientSyncer *);
void requestRemoveNetwork(NetworkId);
void newClientSyncer(ClientSyncer *);
@@
-157,12
+163,11
@@
signals:
void logUpdated(const QString &msg);
public slots:
void logUpdated(const QString &msg);
public slots:
- //void selectBuffer(Buffer *);
-
void disconnectFromCore();
void bufferRemoved(BufferId bufferId);
void bufferRenamed(BufferId bufferId, const QString &newName);
void disconnectFromCore();
void bufferRemoved(BufferId bufferId);
void bufferRenamed(BufferId bufferId, const QString &newName);
+ void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
private slots:
void disconnectedFromCore();
private slots:
void disconnectedFromCore();
@@
-179,8
+184,7
@@
private slots:
void setConnectedToCore(AccountId id, QIODevice *socket = 0);
void setSyncedToCore();
void requestInitialBacklog();
void setConnectedToCore(AccountId id, QIODevice *socket = 0);
void setSyncedToCore();
void requestInitialBacklog();
- void setSecuredConnection();
-
+ void createDefaultBufferView();
private:
Client(QObject *parent = 0);
private:
Client(QObject *parent = 0);
@@
-199,8
+203,9
@@
private:
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
ClientBacklogManager *_backlogManager;
BufferModel * _bufferModel;
BufferSyncer * _bufferSyncer;
ClientBacklogManager *_backlogManager;
- BufferViewManager *_bufferViewManager;
+
Client
BufferViewManager *_bufferViewManager;
ClientIrcListHelper *_ircListHelper;
ClientIrcListHelper *_ircListHelper;
+ ClientUserInputHandler *_inputHandler;
MessageModel *_messageModel;
AbstractMessageProcessor *_messageProcessor;
MessageModel *_messageModel;
AbstractMessageProcessor *_messageProcessor;
@@
-208,6
+213,7
@@
private:
ClientMode clientMode;
bool _connectedToCore, _syncedToCore;
ClientMode clientMode;
bool _connectedToCore, _syncedToCore;
+ bool _internalCore;
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;