diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-09-26 10:23:31 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-09-26 10:23:31 +0000 |
| commit | 8dce3e6c97a7384018baa70c18705428a38ce8a9 (patch) | |
| tree | 5d6e6b201eb872eb2dfc3be754e554504f518540 /src | |
| parent | 3f9761aaa80a7b66fa8c265f01815fd125b54de2 (diff) | |
| download | qxmpp-8dce3e6c97a7384018baa70c18705428a38ce8a9.tar.gz | |
get rid of deprecated accessors in QXmppConfiguration
Diffstat (limited to 'src')
| -rw-r--r-- | src/QXmppConfiguration.cpp | 92 | ||||
| -rw-r--r-- | src/QXmppConfiguration.h | 26 |
2 files changed, 0 insertions, 118 deletions
diff --git a/src/QXmppConfiguration.cpp b/src/QXmppConfiguration.cpp index 8cf46d4e..b34e2d3b 100644 --- a/src/QXmppConfiguration.cpp +++ b/src/QXmppConfiguration.cpp @@ -480,95 +480,3 @@ QList<QSslCertificate> QXmppConfiguration::caCertificates() const return m_caCertificates; } -// obsolete - -QString QXmppConfiguration::passwd() const -{ - return m_password; -} - -void QXmppConfiguration::setPasswd(const QString& password) -{ - m_password = password; -} - -QString QXmppConfiguration::getHost() const -{ - return m_host; -} - -QString QXmppConfiguration::getDomain() const -{ - return m_domain; -} - -int QXmppConfiguration::getPort() const -{ - return m_port; -} - -QString QXmppConfiguration::getUser() const -{ - return m_user; -} - -QString QXmppConfiguration::getPasswd() const -{ - return m_password; -} - -QString QXmppConfiguration::getResource() const -{ - return m_resource; -} - -QString QXmppConfiguration::getJid() const -{ - return jid(); -} - -QString QXmppConfiguration::getJidBare() const -{ - return jidBare(); -} - -bool QXmppConfiguration::getAutoAcceptSubscriptions() const -{ - return m_autoAcceptSubscriptions; -} - -bool QXmppConfiguration::getAutoReconnectionEnabled() const -{ - return m_autoReconnectionEnabled; -} - -bool QXmppConfiguration::getUseSASLAuthentication() const -{ - return m_useSASLAuthentication; -} - -bool QXmppConfiguration::getIgnoreSslErrors() const -{ - return m_ignoreSslErrors; -} - -QXmppConfiguration::StreamSecurityMode QXmppConfiguration::getStreamSecurityMode() const -{ - return m_streamSecurityMode; -} - -QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::getNonSASLAuthMechanism() const -{ - return m_nonSASLAuthMechanism; -} - -QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::getSASLAuthMechanism() const -{ - return m_SASLAuthMechanism; -} - -QNetworkProxy QXmppConfiguration::getNetworkProxy() const -{ - return m_networkProxy; -} - diff --git a/src/QXmppConfiguration.h b/src/QXmppConfiguration.h index 0af83b73..baa54c06 100644 --- a/src/QXmppConfiguration.h +++ b/src/QXmppConfiguration.h @@ -146,32 +146,6 @@ public: QList<QSslCertificate> caCertificates() const; void setCaCertificates(const QList<QSslCertificate> &); - /// \cond - // deprecated in release 0.3.0 - QString Q_DECL_DEPRECATED passwd() const; - void Q_DECL_DEPRECATED setPasswd(const QString&); - - // deprecated in release 0.2.0 - // deprecated accessors, use the form without "get" instead - QString Q_DECL_DEPRECATED getHost() const; - QString Q_DECL_DEPRECATED getDomain() const; - int Q_DECL_DEPRECATED getPort() const; - QString Q_DECL_DEPRECATED getUser() const; - QString Q_DECL_DEPRECATED getPasswd() const; - QString Q_DECL_DEPRECATED getResource() const; - QString Q_DECL_DEPRECATED getJid() const; - QString Q_DECL_DEPRECATED getJidBare() const; - - bool Q_DECL_DEPRECATED getAutoAcceptSubscriptions() const; - bool Q_DECL_DEPRECATED getAutoReconnectionEnabled() const; - bool Q_DECL_DEPRECATED getUseSASLAuthentication() const; - bool Q_DECL_DEPRECATED getIgnoreSslErrors() const; - QXmppConfiguration::StreamSecurityMode Q_DECL_DEPRECATED getStreamSecurityMode() const; - QXmppConfiguration::NonSASLAuthMechanism Q_DECL_DEPRECATED getNonSASLAuthMechanism() const; - QXmppConfiguration::SASLAuthMechanism Q_DECL_DEPRECATED getSASLAuthMechanism() const; - QNetworkProxy Q_DECL_DEPRECATED getNetworkProxy() const; - /// \endcond - private: QString m_host; int m_port; |
