Rename Internal-, Remote- and LegacyConnection to -Peer

[quassel.git] / src / core / core.h

diff --git a/src/core/core.h b/src/core/core.h
index dfecbe0..ebe8061 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -42,7 +42,7 @@
 #include "types.h"
 
 class CoreSession;
 #include "types.h"
 
 class CoreSession;

-class RemoteConnection;
+class RemotePeer;

 struct NetworkInfo;
 class SessionThread;
 class SignalProxy;
 struct NetworkInfo;
 class SessionThread;
 class SignalProxy;


@@ -485,7 +485,7 @@ public slots:
     /** \note This method is threadsafe.
      */
     void syncStorage();
     /** \note This method is threadsafe.
      */
     void syncStorage();

-    void setupInternalClientSession(InternalConnection *clientConnection);
+    void setupInternalClientSession(InternalPeer *clientConnection);

 
 signals:
     //! Sent when a BufferInfo is updated in storage.
 
 signals:
     //! Sent when a BufferInfo is updated in storage.


@@ -520,8 +520,8 @@ private:
     static Core *instanceptr;
 
     SessionThread *createSession(UserId userId, bool restoreState = false);
     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);
     //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
     QString setupCoreForInternalUsage();
     QString setupCore(QVariantMap setupData);


@@ -548,7 +548,7 @@ private:
 
     OidentdConfigGenerator *_oidentdConfigGenerator;
 
 
     OidentdConfigGenerator *_oidentdConfigGenerator;
 

-    QHash<RemoteConnection *, QVariantMap> clientInfo;
+    QHash<RemotePeer *, QVariantMap> clientInfo;

 
     QHash<QString, Storage *> _storageBackends;
 
 
     QHash<QString, Storage *> _storageBackends;