From 06faf77bf82cfe4afe092dd1c91f4815bf5c5763 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Sun, 4 Sep 2016 23:23:26 +0200 Subject: [carbons] rename QXmppCarbonsManager to QXmppCarbonManager --- src/client/QXmppCarbonManager.cpp | 115 +++++++++++++++++++++++++++++++++++++ src/client/QXmppCarbonManager.h | 71 +++++++++++++++++++++++ src/client/QXmppCarbonsManager.cpp | 115 ------------------------------------- src/client/QXmppCarbonsManager.h | 71 ----------------------- src/client/client.pri | 4 +- 5 files changed, 188 insertions(+), 188 deletions(-) create mode 100644 src/client/QXmppCarbonManager.cpp create mode 100644 src/client/QXmppCarbonManager.h delete mode 100644 src/client/QXmppCarbonsManager.cpp delete mode 100644 src/client/QXmppCarbonsManager.h (limited to 'src/client') diff --git a/src/client/QXmppCarbonManager.cpp b/src/client/QXmppCarbonManager.cpp new file mode 100644 index 00000000..106e8ef5 --- /dev/null +++ b/src/client/QXmppCarbonManager.cpp @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2008-2014 The QXmpp developers + * + * Author: + * Manjeet Dahiya + * + * Source: + * https://github.com/qxmpp-project/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. + * + */ + +#include + +#include "QXmppCarbonManager.h" +#include "QXmppConstants.h" +#include "QXmppClient.h" +#include "QXmppDiscoveryManager.h" +#include "QXmppMessage.h" +#include "QXmppUtils.h" + + +QXmppCarbonManager::QXmppCarbonManager() + : m_carbonsEnabled(false) +{ + +} + +QXmppCarbonManager::~QXmppCarbonManager() +{ + +} + +/// Returns whether message carbons are currently enabled + +bool QXmppCarbonManager::carbonsEnabled() const +{ + return m_carbonsEnabled; +} + +/// Enable or disable message carbons. +/// This function does not check whether the server supports +/// message carbons, but just sends the corresponding stanza +/// to the server, so one must check in advance by using the +/// discovery manager. +/// +/// By default, carbon copies are disabled. + +void QXmppCarbonManager::setCarbonsEnabled(bool enabled) +{ + if(m_carbonsEnabled == enabled) + return; + + m_carbonsEnabled = enabled; + + if(client()) { + QXmppIq iq(QXmppIq::Set); + QXmppElement carbonselement; + carbonselement.setTagName(m_carbonsEnabled ? "enable" : "disable"); + carbonselement.setAttribute("xmlns", ns_carbons); + + iq.setExtensions(QXmppElementList() << carbonselement); + client()->sendPacket(iq); + } +} + +QStringList QXmppCarbonManager::discoveryFeatures() const +{ + return QStringList() << ns_carbons; +} + +bool QXmppCarbonManager::handleStanza(const QDomElement &element) +{ + if(element.tagName() != "message") + return false; + + bool sent = true; + QDomElement carbon = element.firstChildElement("sent"); + if(carbon.isNull()) { + carbon = element.firstChildElement("received"); + sent = false; + } + + if(carbon.isNull() || carbon.namespaceURI() != ns_carbons) + return false; // Neither sent nor received -> no carbon message + + QDomElement forwarded = carbon.firstChildElement("forwarded"); + if(forwarded.isNull()) + return false; + + QDomElement messageelement = forwarded.firstChildElement("message"); + if(messageelement.isNull()) + return false; + + QXmppMessage message; + message.parse(messageelement); + + if(sent) + emit messageSent(message); + else + emit messageReceived(message); + + return true; +} diff --git a/src/client/QXmppCarbonManager.h b/src/client/QXmppCarbonManager.h new file mode 100644 index 00000000..923f55ee --- /dev/null +++ b/src/client/QXmppCarbonManager.h @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2008-2014 The QXmpp developers + * + * Author: + * Manjeet Dahiya + * + * Source: + * https://github.com/qxmpp-project/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 QXMPPCARBONMANAGER_H +#define QXMPPCARBONMANAGER_H + +#include "QXmppClientExtension.h" + +class QXmppMessage; + +/// \brief The QXmppCarbonManager class handles message carbons +/// as described in XEP-0280: Message Carbons. +/// +/// This class emits signals whenever another resource of the +/// currently connected client account sent or received a message. +/// +/// \ingroup Managers + +class QXMPP_EXPORT QXmppCarbonManager : public QXmppClientExtension +{ + Q_OBJECT + +public: + QXmppCarbonManager(); + ~QXmppCarbonManager(); + + bool carbonsEnabled() const; + void setCarbonsEnabled(bool enabled); + + /// \cond + QStringList discoveryFeatures() const; + bool handleStanza(const QDomElement &element); + /// \endcond + +signals: + /// \brief Emitted when a message was received from someone else + /// and directed to another resource. + /// If you connect this signal to the \s QXmppClient::messageReceived + /// signal, they will appear as normal messages. + void messageReceived(const QXmppMessage&); + + /// \brief Emitted when another resource sent a message to + /// someone else + void messageSent(const QXmppMessage&); + +private: + bool m_carbonsEnabled; +}; + +#endif // QXMPPCARBONMANAGER_H diff --git a/src/client/QXmppCarbonsManager.cpp b/src/client/QXmppCarbonsManager.cpp deleted file mode 100644 index f09e149c..00000000 --- a/src/client/QXmppCarbonsManager.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2008-2014 The QXmpp developers - * - * Author: - * Manjeet Dahiya - * - * Source: - * https://github.com/qxmpp-project/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. - * - */ - -#include - -#include "QXmppCarbonsManager.h" -#include "QXmppConstants.h" -#include "QXmppClient.h" -#include "QXmppDiscoveryManager.h" -#include "QXmppMessage.h" -#include "QXmppUtils.h" - - -QXmppCarbonsManager::QXmppCarbonsManager() - : m_carbonsEnabled(false) -{ - -} - -QXmppCarbonsManager::~QXmppCarbonsManager() -{ - -} - -/// Returns whether message carbons are currently enabled - -bool QXmppCarbonsManager::carbonsEnabled() const -{ - return m_carbonsEnabled; -} - -/// Enable or disable message carbons. -/// This function does not check whether the server supports -/// message carbons, but just sends the corresponding stanza -/// to the server, so one must check in advance by using the -/// discovery manager. -/// -/// By default, carbon copies are disabled. - -void QXmppCarbonsManager::setCarbonsEnabled(bool enabled) -{ - if(m_carbonsEnabled == enabled) - return; - - m_carbonsEnabled = enabled; - - if(client()) { - QXmppIq iq(QXmppIq::Set); - QXmppElement carbonselement; - carbonselement.setTagName(m_carbonsEnabled ? "enable" : "disable"); - carbonselement.setAttribute("xmlns", ns_carbons); - - iq.setExtensions(QXmppElementList() << carbonselement); - client()->sendPacket(iq); - } -} - -QStringList QXmppCarbonsManager::discoveryFeatures() const -{ - return QStringList() << ns_carbons; -} - -bool QXmppCarbonsManager::handleStanza(const QDomElement &element) -{ - if(element.tagName() != "message") - return false; - - bool sent = true; - QDomElement carbon = element.firstChildElement("sent"); - if(carbon.isNull()) { - carbon = element.firstChildElement("received"); - sent = false; - } - - if(carbon.isNull() || carbon.namespaceURI() != ns_carbons) - return false; // Neither sent nor received -> no carbon message - - QDomElement forwarded = carbon.firstChildElement("forwarded"); - if(forwarded.isNull()) - return false; - - QDomElement messageelement = forwarded.firstChildElement("message"); - if(messageelement.isNull()) - return false; - - QXmppMessage message; - message.parse(messageelement); - - if(sent) - emit messageSent(message); - else - emit messageReceived(message); - - return true; -} diff --git a/src/client/QXmppCarbonsManager.h b/src/client/QXmppCarbonsManager.h deleted file mode 100644 index eab8c658..00000000 --- a/src/client/QXmppCarbonsManager.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2008-2014 The QXmpp developers - * - * Author: - * Manjeet Dahiya - * - * Source: - * https://github.com/qxmpp-project/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 QXMPPCARBONSMANAGER_H -#define QXMPPCARBONSMANAGER_H - -#include "QXmppClientExtension.h" - -class QXmppMessage; - -/// \brief The QXmppCarbonsManager class handles message carbons -/// as described in XEP-0280: Message Carbons. -/// -/// This class emits signals whenever another resource of the -/// currently connected client account sent or received a message. -/// -/// \ingroup Managers - -class QXMPP_EXPORT QXmppCarbonsManager : public QXmppClientExtension -{ - Q_OBJECT - -public: - QXmppCarbonsManager(); - ~QXmppCarbonsManager(); - - bool carbonsEnabled() const; - void setCarbonsEnabled(bool enabled); - - /// \cond - QStringList discoveryFeatures() const; - bool handleStanza(const QDomElement &element); - /// \endcond - -signals: - /// \brief Emitted when a message was received from someone else - /// and directed to another resource. - /// If you connect this signal to the \s QXmppClient::messageReceived - /// signal, they will appear as normal messages. - void messageReceived(const QXmppMessage&); - - /// \brief Emitted when another resource sent a message to - /// someone else - void messageSent(const QXmppMessage&); - -private: - bool m_carbonsEnabled; -}; - -#endif // QXMPPCARBONSMANAGER_H diff --git a/src/client/client.pri b/src/client/client.pri index 6479a81f..650300be 100644 --- a/src/client/client.pri +++ b/src/client/client.pri @@ -3,7 +3,7 @@ INSTALL_HEADERS += \ client/QXmppArchiveManager.h \ client/QXmppBookmarkManager.h \ client/QXmppCallManager.h \ - client/QXmppCarbonsManager.h \ + client/QXmppCarbonManager.h \ client/QXmppClient.h \ client/QXmppClientExtension.h \ client/QXmppConfiguration.h \ @@ -27,7 +27,7 @@ SOURCES += \ client/QXmppArchiveManager.cpp \ client/QXmppBookmarkManager.cpp \ client/QXmppCallManager.cpp \ - client/QXmppCarbonsManager.cpp \ + client/QXmppCarbonManager.cpp \ client/QXmppClient.cpp \ client/QXmppClientExtension.cpp \ client/QXmppConfiguration.cpp \ -- cgit v1.2.3