diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-09-26 13:43:26 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-09-26 13:43:26 +0000 |
| commit | 844bc73b25487589c3761aabb58378ab8aef95fd (patch) | |
| tree | 56da998b2e05e3a492c7e297682f14acb469b74f /src | |
| parent | 8dce3e6c97a7384018baa70c18705428a38ce8a9 (diff) | |
| download | qxmpp-844bc73b25487589c3761aabb58378ab8aef95fd.tar.gz | |
remove deprecated QXmppVCard.h header
Diffstat (limited to 'src')
| -rw-r--r-- | src/QXmppVCard.h | 46 | ||||
| -rw-r--r-- | src/QXmppVCardManager.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppVCardManager.h | 9 | ||||
| -rw-r--r-- | src/src.pro | 1 |
4 files changed, 0 insertions, 60 deletions
diff --git a/src/QXmppVCard.h b/src/QXmppVCard.h deleted file mode 100644 index b3dd05d0..00000000 --- a/src/QXmppVCard.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2008-2011 The QXmpp developers - * - * Authors: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - -#ifndef QXMPPVCARD_H -#define QXMPPVCARD_H - -// deprecated in release 0.3.0 -#ifndef QXMPP_SUPRESS_INTERNAL_VCARD_WARNING -#warning "QXmppVCard.h is deprecated, use QXmppVCardIq instead" -#endif - -#include "QXmppVCardIq.h" - -// QXmppVCard inherits QXmppVCardIq, to maintain backward compatibility -class QXmppVCard : public QXmppVCardIq -{ -public: - QXmppVCard(const QString& bareJid = ""):QXmppVCardIq(bareJid) - { - } - QXmppVCard(QXmppVCardIq vcard):QXmppVCardIq(vcard) - { - } -}; - -#endif //QXMPPVCARD_H diff --git a/src/QXmppVCardManager.cpp b/src/QXmppVCardManager.cpp index 20606d13..732b4244 100644 --- a/src/QXmppVCardManager.cpp +++ b/src/QXmppVCardManager.cpp @@ -55,10 +55,6 @@ bool QXmppVCardManager::handleStanza(const QDomElement &element) emit vCardReceived(vCardIq); - // deprecated in 0.3.0 release - QXmppVCard oldVCard(vCardIq); - emit vCardReceived(oldVCard); - return true; } diff --git a/src/QXmppVCardManager.h b/src/QXmppVCardManager.h index 133f8e16..5c2ac250 100644 --- a/src/QXmppVCardManager.h +++ b/src/QXmppVCardManager.h @@ -30,10 +30,6 @@ #include "QXmppClientExtension.h" #include "QXmppVCardIq.h" -#define QXMPP_SUPRESS_INTERNAL_VCARD_WARNING -#include "QXmppVCard.h" -#undef QXMPP_SUPRESS_INTERNAL_VCARD_WARNING - /// \brief The QXmppVCardManager class gets/sets XMPP vCards. It is an /// implementation of XEP-0054: vcard-temp. /// @@ -84,11 +80,6 @@ signals: /// after calling the requestClientVCard() function. void clientVCardReceived(); - /// \cond -// deprecated in release 0.3.0 - void vCardReceived(const QXmppVCard&); - /// \endcond - private: QXmppVCardIq m_clientVCard; ///< Stores the vCard of the connected client bool m_isClientVCardReceived; diff --git a/src/src.pro b/src/src.pro index 65ba8a83..3c8cbe48 100644 --- a/src/src.pro +++ b/src/src.pro @@ -85,7 +85,6 @@ INSTALL_HEADERS = QXmppUtils.h \ QXmppTransferManager.h \ QXmppVCardManager.h \ QXmppVCardIq.h \ - QXmppVCard.h \ QXmppVersionIq.h \ QXmppVersionManager.h |
