From 2a78066c9fa49517bccebbef2e005a674ab4ad27 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Wed, 12 Sep 2012 16:01:35 +0200 Subject: make QXmppStreamInitiationIq private API --- src/base/QXmppStreamInitiationIq.cpp | 2 +- src/base/QXmppStreamInitiationIq.h | 75 ------------------------------ src/base/QXmppStreamInitiationIq_p.h | 88 ++++++++++++++++++++++++++++++++++++ src/base/base.pri | 4 +- 4 files changed, 91 insertions(+), 78 deletions(-) delete mode 100644 src/base/QXmppStreamInitiationIq.h create mode 100644 src/base/QXmppStreamInitiationIq_p.h (limited to 'src') diff --git a/src/base/QXmppStreamInitiationIq.cpp b/src/base/QXmppStreamInitiationIq.cpp index 7b1b4b89..bb3c6101 100644 --- a/src/base/QXmppStreamInitiationIq.cpp +++ b/src/base/QXmppStreamInitiationIq.cpp @@ -24,7 +24,7 @@ #include #include "QXmppConstants.h" -#include "QXmppStreamInitiationIq.h" +#include "QXmppStreamInitiationIq_p.h" #include "QXmppUtils.h" QXmppDataForm QXmppStreamInitiationIq::featureForm() const diff --git a/src/base/QXmppStreamInitiationIq.h b/src/base/QXmppStreamInitiationIq.h deleted file mode 100644 index 27e59afd..00000000 --- a/src/base/QXmppStreamInitiationIq.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2008-2012 The QXmpp developers - * - * Author: - * Jeremy Lainé - * - * 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 QXMPPSTREAMINITIATIONIQ_H -#define QXMPPSTREAMINITIATIONIQ_H - -#include - -#include "QXmppDataForm.h" -#include "QXmppIq.h" -#include "QXmppTransferManager.h" - -class QDomElement; -class QXmlStreamWriter; - -class QXMPP_EXPORT QXmppStreamInitiationIq : public QXmppIq -{ -public: - enum Profile { - None = 0, - FileTransfer, - }; - - QXmppDataForm featureForm() const; - void setFeatureForm(const QXmppDataForm &form); - - QXmppTransferFileInfo fileInfo() const; - void setFileInfo(const QXmppTransferFileInfo &info); - - QString mimeType() const; - void setMimeType(const QString &mimeType); - - QXmppStreamInitiationIq::Profile profile() const; - void setProfile(QXmppStreamInitiationIq::Profile profile); - - QString siId() const; - void setSiId(const QString &id); - - static bool isStreamInitiationIq(const QDomElement &element); - -protected: - /// \cond - void parseElementFromChild(const QDomElement &element); - void toXmlElementFromChild(QXmlStreamWriter *writer) const; - /// \endcond - -private: - QXmppDataForm m_featureForm; - QXmppTransferFileInfo m_fileInfo; - QString m_mimeType; - Profile m_profile; - QString m_siId; -}; - -#endif diff --git a/src/base/QXmppStreamInitiationIq_p.h b/src/base/QXmppStreamInitiationIq_p.h new file mode 100644 index 00000000..a8e9eb15 --- /dev/null +++ b/src/base/QXmppStreamInitiationIq_p.h @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2008-2012 The QXmpp developers + * + * Author: + * Jeremy Lainé + * + * 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 QXMPPSTREAMINITIATIONIQ_P_H +#define QXMPPSTREAMINITIATIONIQ_P_H + +#include + +#include "QXmppDataForm.h" +#include "QXmppIq.h" +#include "QXmppTransferManager.h" + +class QDomElement; +class QXmlStreamWriter; + +// +// W A R N I N G +// ------------- +// +// This file is not part of the QXmpp API. It exists for the convenience +// of the QXmppTransferManager class. +// +// This header file may change from version to version without notice, +// or even be removed. +// +// We mean it. +// + +class QXMPP_AUTOTEST_EXPORT QXmppStreamInitiationIq : public QXmppIq +{ +public: + enum Profile { + None = 0, + FileTransfer, + }; + + QXmppDataForm featureForm() const; + void setFeatureForm(const QXmppDataForm &form); + + QXmppTransferFileInfo fileInfo() const; + void setFileInfo(const QXmppTransferFileInfo &info); + + QString mimeType() const; + void setMimeType(const QString &mimeType); + + QXmppStreamInitiationIq::Profile profile() const; + void setProfile(QXmppStreamInitiationIq::Profile profile); + + QString siId() const; + void setSiId(const QString &id); + + static bool isStreamInitiationIq(const QDomElement &element); + +protected: + /// \cond + void parseElementFromChild(const QDomElement &element); + void toXmlElementFromChild(QXmlStreamWriter *writer) const; + /// \endcond + +private: + QXmppDataForm m_featureForm; + QXmppTransferFileInfo m_fileInfo; + QString m_mimeType; + Profile m_profile; + QString m_siId; +}; + +#endif diff --git a/src/base/base.pri b/src/base/base.pri index 6461bc79..ec335769 100644 --- a/src/base/base.pri +++ b/src/base/base.pri @@ -30,7 +30,6 @@ INSTALL_HEADERS += \ base/QXmppStanza.h \ base/QXmppStream.h \ base/QXmppStreamFeatures.h \ - base/QXmppStreamInitiationIq.h \ base/QXmppStun.h \ base/QXmppUtils.h \ base/QXmppVCardIq.h \ @@ -38,7 +37,8 @@ INSTALL_HEADERS += \ HEADERS += \ base/QXmppCodec_p.h \ - base/QXmppSasl_p.h + base/QXmppSasl_p.h \ + base/QXmppStreamInitiationIq.h # Source files SOURCES += \ -- cgit v1.2.3