projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make compile on MSVC again... that thing doesn't know #warning, apparently -_-
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
7dd0a53
..
492208a
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-18,18
+18,23
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef
_CORESESSION_H_
-#define
_CORESESSION_H_
+#ifndef
CORESESSION_H
+#define
CORESESSION_H
#include <QString>
#include <QVariant>
#include <QString>
#include <QVariant>
+#include "corecoreinfo.h"
+#include "corealiasmanager.h"
#include "message.h"
class BufferSyncer;
#include "message.h"
class BufferSyncer;
+class CoreBacklogManager;
+class CoreBufferViewManager;
+class CoreIrcListHelper;
class Identity;
class NetworkConnection;
class Identity;
class NetworkConnection;
-class Network;
+class
Core
Network;
struct NetworkInfo;
class SignalProxy;
struct NetworkInfo;
class SignalProxy;
@@
-44,7
+49,7
@@
public:
QList<BufferInfo> buffers() const;
UserId user() const;
QList<BufferInfo> buffers() const;
UserId user() const;
- Network *network(NetworkId) const;
+
Core
Network *network(NetworkId) const;
NetworkConnection *networkConnection(NetworkId) const;
Identity *identity(IdentityId) const;
NetworkConnection *networkConnection(NetworkId) const;
Identity *identity(IdentityId) const;
@@
-52,6
+57,11
@@
public:
SignalProxy *signalProxy() const;
SignalProxy *signalProxy() const;
+ const AliasManager &aliasManager() const { return _aliasManager; }
+ AliasManager &aliasManager() { return _aliasManager; }
+
+ inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
+
void attachNetworkConnection(NetworkConnection *conn);
//! Return necessary data for restoring the session after restarting the core
void attachNetworkConnection(NetworkConnection *conn);
//! Return necessary data for restoring the session after restarting the core
@@
-66,7
+76,6
@@
public slots:
void connectToNetwork(NetworkId);
void disconnectFromNetwork(NetworkId id);
void connectToNetwork(NetworkId);
void disconnectFromNetwork(NetworkId id);
- void sendBacklog(BufferInfo, QVariant, QVariant);
void msgFromClient(BufferInfo, QString message);
//! Create an identity and propagate the changes to the clients.
void msgFromClient(BufferInfo, QString message);
//! Create an identity and propagate the changes to the clients.
@@
-74,11
+83,6
@@
public slots:
*/
void createIdentity(const Identity &identity);
*/
void createIdentity(const Identity &identity);
- //! Update an identity and propagate the changes to the clients.
- /** \param identity The identity to be updated.
- */
- void updateIdentity(const Identity &identity);
-
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
*/
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
*/
@@
-89,11
+93,6
@@
public slots:
*/
void createNetwork(const NetworkInfo &info);
*/
void createNetwork(const NetworkInfo &info);
- //! Update a network and propagate the changes to the clients.
- /** \param info The updated network settings.
- */
- void updateNetwork(const NetworkInfo &info);
-
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
*/
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
*/
@@
-127,8
+126,6
@@
signals:
//void connectToIrc(QString net);
//void disconnectFromIrc(QString net);
//void connectToIrc(QString net);
//void disconnectFromIrc(QString net);
- void backlogData(BufferInfo, QVariantList, bool done);
-
void bufferInfoUpdated(BufferInfo);
void scriptResult(QString result);
void bufferInfoUpdated(BufferInfo);
void scriptResult(QString result);
@@
-151,13
+148,17
@@
signals:
void bufferRenamed(BufferId, QString);
private slots:
void bufferRenamed(BufferId, QString);
private slots:
+ void removeClient(QIODevice *dev);
+
void recvStatusMsgFromServer(QString msg);
void recvStatusMsgFromServer(QString msg);
- void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "",
quint8
flags = Message::None);
+ void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "",
Message::Flags
flags = Message::None);
void networkConnected(NetworkId networkid);
void networkDisconnected(NetworkId networkid);
void destroyNetwork(NetworkId);
void networkConnected(NetworkId networkid);
void networkDisconnected(NetworkId networkid);
void destroyNetwork(NetworkId);
+ void identityUpdated(const QVariantMap &);
+
//! Called when storage updated a BufferInfo.
/** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.
* \param user The buffer's owner (not necessarily us)
//! Called when storage updated a BufferInfo.
/** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.
* \param user The buffer's owner (not necessarily us)
@@
-165,7
+166,7
@@
private slots:
*/
void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
*/
void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
- void storeBufferLastSeen
(BufferId buffer, const QDateTime &lastSeen
);
+ void storeBufferLastSeen
Msg(BufferId buffer, const MsgId &msgId
);
void scriptRequest(QString script);
void scriptRequest(QString script);
@@
-176,12
+177,17
@@
private:
UserId _user;
SignalProxy *_signalProxy;
UserId _user;
SignalProxy *_signalProxy;
+ CoreAliasManager _aliasManager;
QHash<NetworkId, NetworkConnection *> _connections;
QHash<NetworkId, NetworkConnection *> _connections;
- QHash<NetworkId, Network *> _networks;
-
QHash<NetworkId,
Network *> _networksToRemove;
+ QHash<NetworkId,
Core
Network *> _networks;
+
// QHash<NetworkId, Core
Network *> _networksToRemove;
QHash<IdentityId, Identity *> _identities;
BufferSyncer *_bufferSyncer;
QHash<IdentityId, Identity *> _identities;
BufferSyncer *_bufferSyncer;
+ CoreBacklogManager *_backlogManager;
+ CoreBufferViewManager *_bufferViewManager;
+ CoreIrcListHelper *_ircListHelper;
+ CoreCoreInfo _coreInfo;
QScriptEngine *scriptEngine;
QScriptEngine *scriptEngine;