1 files changed, 0 insertions, 125 deletions
diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index ec6a41da..14a5f2ad 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -292,61 +292,6 @@ void QXmppClient::connectToServer(const QString &jid, const QString &password)
     connectToServer(config);
 }
 
-/// Overloaded function.
-/// \param host host name of the XMPP server where connection has to be made
-/// (e.g. "jabber.org" and "talk.google.com"). It can also be an IP address in
-/// the form of a string (e.g. "192.168.1.25").
-/// \param user Username of the account at the specified XMPP server. It should
-/// be the name without the domain name. E.g. "qxmpp.test1" and not
-/// "qxmpp.test1@gmail.com"
-/// \param password Password for the specified username
-/// \param domain Domain name e.g. "gmail.com" and "jabber.org".
-/// \param port Port number at which the XMPP server is listening. The default
-/// value is 5222.
-/// \param initialPresence The initial presence which will be set for this user
-/// after establishing the session. The default value is QXmppPresence::Available
-
-void QXmppClient::connectToServer(const QString& host, const QString& user,
-                                  const QString& password, const QString& domain,
-                                  int port,
-                                  const QXmppPresence& initialPresence)
-{
-    QXmppConfiguration &config = d->stream->configuration();
-    config.setHost(host);
-    config.setUser(user);
-    config.setPassword(password);
-    config.setDomain(domain);
-    config.setPort(port);
-    connectToServer(config, initialPresence);
-}
-
-/// Overloaded function.
-/// \param host host name of the XMPP server where connection has to be made
-/// (e.g. "jabber.org" and "talk.google.com"). It can also be an IP address in
-/// the form of a string (e.g. "192.168.1.25").
-/// \param bareJid BareJid of the account at the specified XMPP server.
-/// (e.g. "qxmpp.test1@gmail.com" or qxmpptest@jabber.org.)
-/// \param password Password for the specified username
-/// \param port Port number at which the XMPP server is listening. The default
-/// value is 5222.
-/// \param initialPresence The initial presence which will be set for this user
-/// after establishing the session. The default value is QXmppPresence::Available
-
-void QXmppClient::connectToServer(const QString& host,
-                                  const QString& bareJid,
-                                  const QString& password,
-                                  int port,
-                                  const QXmppPresence& initialPresence)
-{
-    QXmppConfiguration config;
-    config.setHost(host);
-    config.setUser(jidToUser(bareJid));
-    config.setDomain(jidToDomain(bareJid));
-    config.setPassword(password);
-    config.setPort(port);
-    connectToServer(config, initialPresence);
-}
-
 /// After successfully connecting to the server use this function to send
 /// stanzas to the server. This function can solely be used to send various kind
 /// of stanzas to the server. QXmppPacket is a parent class of all the stanzas
@@ -597,73 +542,3 @@ void QXmppClient::xmppConnected()
     sendPacket(d->clientPresence);
 }
 
-// deprecated functions
-const QXmppPresence& QXmppClient::getClientPresence() const
-{
-    return d->clientPresence;
-}
-
-QXmppConfiguration& QXmppClient::getConfiguration()
-{
-    return d->stream->configuration();
-}
-
-const QXmppConfiguration& QXmppClient::getConfiguration() const
-{
-    return d->stream->configuration();
-}
-
-QXmppRosterManager& QXmppClient::getRoster()
-{
-    return *d->rosterManager;
-}
-
-QAbstractSocket::SocketError QXmppClient::getSocketError()
-{
-    return d->stream->socketError();
-}
-
-QXmppVCardManager& QXmppClient::getVCardManager()
-{
-    return *d->vCardManager;
-}
-
-QXmppStanza::Error::Condition QXmppClient::getXmppStreamError()
-{
-    return d->stream->xmppStreamError();
-}
-
-void QXmppClient::disconnect()
-{
-    disconnectFromServer();
-}
-
-void QXmppClient::setClientPresence(const QString& statusText)
-{
-    QXmppPresence newPresence = d->clientPresence;
-    newPresence.status().setStatusText(statusText);
-    setClientPresence(newPresence);
-}
-
-void QXmppClient::setClientPresence(QXmppPresence::Type presenceType)
-{
-    QXmppPresence newPresence = d->clientPresence;
-    newPresence.setType(presenceType);
-    setClientPresence(newPresence);
-}
-
-void QXmppClient::setClientPresence(QXmppPresence::Status::Type statusType)
-{
-    QXmppPresence newPresence = d->clientPresence;
-    if (statusType == QXmppPresence::Status::Offline)
-        newPresence.setType(QXmppPresence::Unavailable);
-    else
-        newPresence.setType(QXmppPresence::Available);
-    newPresence.status().setType(statusType);
-    setClientPresence(newPresence);
-}
-
-QXmppReconnectionManager* QXmppClient::getReconnectionManager()
-{
-    return d->reconnectionManager;
-}