From: Michael Marley <michael@michaelmarley.com>
Date: Wed, 17 Sep 2014 02:04:11 +0000 (-0400)
Subject: Rename socketConnected() to socketOpen() to reduce confusion
X-Git-Tag: 0.11.0~8^2
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1f58e3506add8dc546c1e98367dce2cd24e5773d

Rename socketConnected() to socketOpen() to reduce confusion
---

diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp
index 552662a7..4223c5f8 100644
--- a/src/core/corenetwork.cpp
+++ b/src/core/corenetwork.cpp
@@ -82,7 +82,7 @@ CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session)
     connect(this, SIGNAL(newEvent(Event *)), coreSession()->eventManager(), SLOT(postEvent(Event *)));
 
     if (Quassel::isOptionSet("oidentd")) {
-        connect(this, SIGNAL(socketConnected(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Core::instance()->oidentdConfigGenerator(), SLOT(addSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Qt::BlockingQueuedConnection);
+        connect(this, SIGNAL(socketOpen(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Core::instance()->oidentdConfigGenerator(), SLOT(addSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Qt::BlockingQueuedConnection);
         connect(this, SIGNAL(socketDisconnected(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Core::instance()->oidentdConfigGenerator(), SLOT(removeSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)));
     }
 }
@@ -451,7 +451,7 @@ void CoreNetwork::socketInitialized()
         return;
     }
     
-    emit socketConnected(identity, localAddress(), localPort(), peerAddress(), peerPort());
+    emit socketOpen(identity, localAddress(), localPort(), peerAddress(), peerPort());
     
     Server server = usedServer();
 #ifdef HAVE_SSL
diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h
index 6bfea49a..c4bea908 100644
--- a/src/core/corenetwork.h
+++ b/src/core/corenetwork.h
@@ -157,7 +157,7 @@ signals:
     void sslErrors(const QVariant &errorData);
 
     void newEvent(Event *event);
-    void socketConnected(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
+    void socketOpen(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
     void socketInitialized(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
     void socketDisconnected(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);