projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #88 from mamarley/psqllimitallfix
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
019d5b3
..
ade372a
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
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 *
@@
-27,6
+27,7
@@
#include "corecoreinfo.h"
#include "corealiasmanager.h"
#include "coreignorelistmanager.h"
#include "corecoreinfo.h"
#include "corealiasmanager.h"
#include "coreignorelistmanager.h"
+#include "protocol.h"
#include "message.h"
#include "storage.h"
#include "message.h"
#include "storage.h"
@@
-38,6
+39,7
@@
class CoreIrcListHelper;
class CoreNetwork;
class CoreNetworkConfig;
class CoreSessionEventProcessor;
class CoreNetwork;
class CoreNetworkConfig;
class CoreSessionEventProcessor;
+class CoreTransferManager;
class CtcpParser;
class EventManager;
class EventStringifier;
class CtcpParser;
class EventManager;
class EventStringifier;
@@
-68,7
+70,7
@@
public:
inline CoreNetworkConfig *networkConfig() const { return _networkConfig; }
NetworkConnection *networkConnection(NetworkId) const;
inline CoreNetworkConfig *networkConfig() const { return _networkConfig; }
NetworkConnection *networkConnection(NetworkId) const;
-
QVariant sessionState()
;
+
Protocol::SessionState sessionState() const
;
inline SignalProxy *signalProxy() const { return _signalProxy; }
inline SignalProxy *signalProxy() const { return _signalProxy; }
@@
-84,6
+86,8
@@
public:
inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; }
inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; }
+ inline CoreTransferManager *transferManager() const { return _transferManager; }
+
// 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
@@
-130,7
+134,7
@@
public slots:
signals:
void initialized();
signals:
void initialized();
- void sessionState(const
QVariant &
);
+ void sessionState(const
Protocol::SessionState &sessionState
);
//void msgFromGui(uint netid, QString buf, QString message);
void displayMsg(Message message);
//void msgFromGui(uint netid, QString buf, QString message);
void displayMsg(Message message);
@@
-198,6
+202,7
@@
private:
CoreIrcListHelper *_ircListHelper;
CoreNetworkConfig *_networkConfig;
CoreCoreInfo _coreInfo;
CoreIrcListHelper *_ircListHelper;
CoreNetworkConfig *_networkConfig;
CoreCoreInfo _coreInfo;
+ CoreTransferManager *_transferManager;
EventManager *_eventManager;
EventStringifier *_eventStringifier; // should eventually move into client
EventManager *_eventManager;
EventStringifier *_eventStringifier; // should eventually move into client