diff --git a/src/mqtt/mqtt.pri b/src/mqtt/mqtt.pri index b38a1cc..006ba5a 100644 --- a/src/mqtt/mqtt.pri +++ b/src/mqtt/mqtt.pri @@ -26,7 +26,6 @@ SOURCES += \ $$PWD/qmqtt_message.cpp \ $$PWD/qmqtt_network.cpp \ $$PWD/qmqtt_routesubscription.cpp \ - $$PWD/qmqtt_routedmessage.cpp \ $$PWD/qmqtt_router.cpp \ $$PWD/qmqtt_message_p.cpp \ $$PWD/qmqtt_socket.cpp \ diff --git a/src/mqtt/qmqtt_routedmessage.cpp b/src/mqtt/qmqtt_routedmessage.cpp deleted file mode 100644 index 91a17b2..0000000 --- a/src/mqtt/qmqtt_routedmessage.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * qmqtt_router.cpp - qmqtt router - * - * Copyright (c) 2013 Ery Lee - * Router added by Niklas Wulf - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of mqttc nor the names of its contributors may be used - * to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -#include "qmqtt_routedmessage.h" - -namespace QMQTT { - -RoutedMessage::RoutedMessage(const Message &message) : _message(message) -{ -} - -const Message &RoutedMessage::message() const -{ - return _message; -} - -QHash RoutedMessage::parameters() const -{ - return _parameters; -} - -} // namespace QMQTT - diff --git a/src/mqtt/qmqtt_routedmessage.h b/src/mqtt/qmqtt_routedmessage.h index e636ace..f605d9d 100644 --- a/src/mqtt/qmqtt_routedmessage.h +++ b/src/mqtt/qmqtt_routedmessage.h @@ -39,15 +39,17 @@ namespace QMQTT { -class Message; - -class Q_MQTT_EXPORT RoutedMessage +class RoutedMessage { public: - explicit RoutedMessage(const Message &message); - - const Message &message() const; - QHash parameters() const; + inline RoutedMessage(const Message &message) + : _message(message) + {} + + inline const Message &message() const + { return _message; } + inline QHash parameters() const + { return _parameters; } private: friend class RouteSubscription;