projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sometimes I hate git... forgot stupid -a for git commit
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
1403c74
..
913f630
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-31,7
+31,7
@@
class CoreBacklogManager;
class CoreBufferViewManager;
class Identity;
class NetworkConnection;
class CoreBufferViewManager;
class Identity;
class NetworkConnection;
-class Network;
+class
Core
Network;
struct NetworkInfo;
class SignalProxy;
struct NetworkInfo;
class SignalProxy;
@@
-46,7
+46,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;
@@
-178,8
+178,8
@@
private:
SignalProxy *_signalProxy;
QHash<NetworkId, NetworkConnection *> _connections;
SignalProxy *_signalProxy;
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;