X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=ebe8061963adb2ab8964e1493a8035ab4bb3adf2;hp=48c015de3de4c5618a19651d38da7d79bbce154f;hb=1cc49e5bd7542366995f501adf60da4ad90869e2;hpb=0e1b154f362e13c2c9009f842e3fd6d8e7c346fc diff --git a/src/core/core.h b/src/core/core.h index 48c015de..ebe80619 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by the Quassel Project * + * Copyright (C) 2005-2013 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -42,7 +42,7 @@ #include "types.h" class CoreSession; -class RemoteConnection; +class RemotePeer; struct NetworkInfo; class SessionThread; class SignalProxy; @@ -485,7 +485,7 @@ public slots: /** \note This method is threadsafe. */ void syncStorage(); - void setupInternalClientSession(InternalConnection *clientConnection); + void setupInternalClientSession(InternalPeer *clientConnection); signals: //! Sent when a BufferInfo is updated in storage. @@ -520,8 +520,8 @@ private: static Core *instanceptr; SessionThread *createSession(UserId userId, bool restoreState = false); - void setupClientSession(RemoteConnection *connection, UserId uid); - void addClientHelper(RemoteConnection *connection, UserId uid); + void setupClientSession(RemotePeer *peer, UserId uid); + void addClientHelper(RemotePeer *peer, UserId uid); //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg); QString setupCoreForInternalUsage(); QString setupCore(QVariantMap setupData); @@ -548,7 +548,7 @@ private: OidentdConfigGenerator *_oidentdConfigGenerator; - QHash clientInfo; + QHash clientInfo; QHash _storageBackends;