remove deprecated QXmppVCard.h header

5 files changed, 9 insertions, 66 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e573ef84..8fc47326 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-QXmpp 0.x.y (UNRELEASED)
+QXmpp 0.4.0 (UNRELEASED)
 ------------------------
 
   - New XEPs
@@ -14,16 +14,19 @@ QXmpp 0.x.y (UNRELEASED)
 	QXmppVCardIq
 	QXmppRosterIq
 
-  - Remove deprecated QXmppRoster.h header.
+  - Remove deprecated headers:
+    * QXmppRoster.h
+    * QXmppVCard.h
+
   - Add TURN support for VoIP calls to use a relay in double-NAT network topologies.
   - Overhaul Multi-User Chat support to make it easier and more fully featured.
   - Improve QXmppServer packet routing performance.
   - Add support for X-FACEBOOK-PLATFORM SASL method.
 
-Issue Fixes:
-	Issue 105: Initial presence is set before the roster request
-	Issue 106: QXmppClient can't override Qt's set of trusted SSL CAs
-    Issue 116: sessionStarted not set for non-SASL connections
+  - Fix issues:
+    * Issue 105: Initial presence is set before the roster request
+    * Issue 106: QXmppClient can't override Qt's set of trusted SSL CAs
+    * Issue 116: sessionStarted not set for non-SASL connections
 	
 QXmpp 0.3.0 (Mar 05, 2011)
 ------------------------
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