QXmppStream:

- rename connect() to connectToHost()
- rename disconnect() to disconnectFromHost()

3 files changed, 16 insertions, 16 deletions

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index 733f4dba..2956c5ce 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -211,7 +211,7 @@ void QXmppClient::connectToServer(const QXmppConfiguration& config,
     d->clientPresence = initialPresence;
     d->clientPresence.setExtensions(d->stream->presenceExtensions());
 
-    d->stream->connect();
+    d->stream->connectToHost();
 }
 
 /// Overloaded function.
@@ -243,7 +243,7 @@ void QXmppClient::connectToServer(const QString& host, const QString& user,
     d->clientPresence = initialPresence;
     d->clientPresence.setExtensions(d->stream->presenceExtensions());
 
-    d->stream->connect();
+    d->stream->connectToHost();
 }
 
 /// Overloaded function.
@@ -316,7 +316,7 @@ void QXmppClient::disconnectFromServer()
     if (d->stream->isConnected())
     {
         sendPacket(d->clientPresence);
-        d->stream->disconnect();
+        d->stream->disconnectFromHost();
     }
 }
 
@@ -385,7 +385,7 @@ void QXmppClient::setClientPresence(const QXmppPresence& presence)
         if (d->stream->isConnected())
         {
             sendPacket(d->clientPresence);
-            d->stream->disconnect();
+            d->stream->disconnectFromHost();
         }
     }
     else if (!d->stream->isConnected())
diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp
index 69d7f442..b17a314d 100644
--- a/src/QXmppStream.cpp
+++ b/src/QXmppStream.cpp
@@ -167,7 +167,7 @@ QXmppConfiguration& QXmppStream::configuration()
     return d->config;
 }
 
-void QXmppStream::connect()
+void QXmppStream::connectToHost()
 {
     info(QString("Connecting to: %1:%2").arg(configuration().
             host()).arg(configuration().port()));
@@ -365,14 +365,14 @@ void QXmppStream::handleStanza(const QDomElement &nodeRecv)
                  remoteSecurity == QXmppConfiguration::TLSRequired))
             {
                 warning("Disconnecting as TLS is required, but SSL support is not available");
-                disconnect();
+                disconnectFromHost();
                 return;
             }
             if (localSecurity == QXmppConfiguration::TLSRequired &&
                 remoteSecurity == QXmppConfiguration::TLSDisabled)
             {
                 warning("Disconnecting as TLS is required, but not supported by the server");
-                disconnect();
+                disconnectFromHost();
                 return;
             }
 
@@ -400,7 +400,7 @@ void QXmppStream::handleStanza(const QDomElement &nodeRecv)
             if (mechanisms.isEmpty())
             {
                 warning("No supported SASL Authentication mechanism available");
-                disconnect();
+                disconnectFromHost();
                 return;
             }
             else if (!mechanisms.contains(mechanism))
@@ -477,7 +477,7 @@ void QXmppStream::handleStanza(const QDomElement &nodeRecv)
                 break;
             default :
                 warning("Too many authentication steps");
-                disconnect();
+                disconnectFromHost();
                 break;
             }
         }
@@ -490,7 +490,7 @@ void QXmppStream::handleStanza(const QDomElement &nodeRecv)
             emit error(QXmppClient::XmppStreamError);
 
             warning("Authentication failure");
-            disconnect();
+            disconnectFromHost();
         }
     }
     else if(ns == ns_client)
@@ -669,7 +669,7 @@ void QXmppStream::handleStanza(const QDomElement &nodeRecv)
                     else
                     {
                         warning("No supported Non-SASL Authentication mechanism available");
-                        disconnect();
+                        disconnectFromHost();
                         return;
                     }
                     sendNonSASLAuth(plainText);
@@ -873,7 +873,7 @@ void QXmppStream::sendAuthDigestMD5ResponseStep1(const QString& challenge)
     if (!map.contains("nonce"))
     {
         warning("sendAuthDigestMD5ResponseStep1: Invalid input");
-        disconnect();
+        disconnectFromHost();
         return;
     }
 
@@ -954,7 +954,7 @@ void QXmppStream::sendSessionIQ()
     sendPacket(session);
 }
 
-void QXmppStream::disconnect()
+void QXmppStream::disconnectFromHost()
 {
     d->authStep = 0;
     sendEndStream();
@@ -1021,7 +1021,7 @@ void QXmppStream::pingSend()
 void QXmppStream::pingTimeout()
 {
     warning("Ping timeout");
-    disconnect();
+    disconnectFromHost();
     emit error(QXmppClient::KeepAliveError);
 }
 
diff --git a/src/QXmppStream.h b/src/QXmppStream.h
index bac32f27..ddfe9d9e 100644
--- a/src/QXmppStream.h
+++ b/src/QXmppStream.h
@@ -66,8 +66,8 @@ class QXmppStream : public QObject
 public:
     QXmppStream(QSslSocket *socket, QObject *parent);
     ~QXmppStream();
-    void connect();
-    void disconnect();
+    void connectToHost();
+    void disconnectFromHost();
     bool isConnected() const;
     bool sendData(const QByteArray&);
     bool sendPacket(const QXmppPacket&);