From 184ce6cf48782848a507060340d26f23905848f5 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 7 Jun 2018 11:31:26 +0200 Subject: [PATCH] fix warnings --- libmea-core/devicediscovery.h | 2 +- libmea-core/discovery/upnpdiscovery.cpp | 4 ++-- libmea-core/rulemanager.cpp | 6 +++--- libmea-core/tcpsocketinterface.cpp | 2 +- libmea-core/websocketinterface.h | 2 +- mea.pri | 1 + 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libmea-core/devicediscovery.h b/libmea-core/devicediscovery.h index 9e85f4a0..f9bb90b6 100644 --- a/libmea-core/devicediscovery.h +++ b/libmea-core/devicediscovery.h @@ -20,7 +20,7 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const override; QVariant data(const QModelIndex &index, int role) const override; - QHash roleNames() const; + QHash roleNames() const override; Q_INVOKABLE void discoverDevices(const QUuid &deviceClassId, const QVariantList &discoveryParams = {}); diff --git a/libmea-core/discovery/upnpdiscovery.cpp b/libmea-core/discovery/upnpdiscovery.cpp index 4f1da6e2..1b9e87fe 100644 --- a/libmea-core/discovery/upnpdiscovery.cpp +++ b/libmea-core/discovery/upnpdiscovery.cpp @@ -104,7 +104,7 @@ void UpnpDiscovery::writeDiscoveryPacket() // qDebug() << "sending discovery package"; foreach (QUdpSocket* socket, m_sockets) { - quint64 ret = socket->writeDatagram(ssdpSearchMessage, QHostAddress("239.255.255.250"), 1900); + qint64 ret = socket->writeDatagram(ssdpSearchMessage, QHostAddress("239.255.255.250"), 1900); if (ret != ssdpSearchMessage.length()) { qWarning() << "Error sending SSDP query on socket" << socket->localAddress(); } @@ -165,7 +165,7 @@ void UpnpDiscovery::readData() m_foundDevices.append(location); qDebug() << "Getting server data from:" << location; QNetworkReply *reply = m_networkAccessManager->get(QNetworkRequest(location)); - connect(reply, &QNetworkReply::sslErrors, [this, reply](const QList &errors){ + connect(reply, &QNetworkReply::sslErrors, [reply](const QList &errors){ reply->ignoreSslErrors(errors); }); m_runningReplies.insert(reply, hostAddress); diff --git a/libmea-core/rulemanager.cpp b/libmea-core/rulemanager.cpp index 9ae8aee4..a87add94 100644 --- a/libmea-core/rulemanager.cpp +++ b/libmea-core/rulemanager.cpp @@ -260,11 +260,11 @@ void RuleManager::parseRuleExitActions(const QVariantList &ruleActions, Rule *ru void RuleManager::parseTimeDescriptor(const QVariantMap &timeDescriptor, Rule *rule) { Q_UNUSED(rule) - - foreach (const QVariant &timeEventItemVariant, timeDescriptor.value("timeEventItems").toList()) { + Q_UNUSED(timeDescriptor) +// foreach (const QVariant &timeEventItemVariant, timeDescriptor.value("timeEventItems").toList()) { // TimeEventItem *timeEventItem = new TimeEventItem(); // timeEventItem->setDateTime(QDateTime::fromSecsSinceEpoch(timeEventItemVariant.toMap().value("datetime").toULongLong())); // timeEventItem->setTime(QTime::fromString(timeEventItemVariant.toMap().value("time").toString())); // timeEventItem->setRepeatingOption(); - } +// } } diff --git a/libmea-core/tcpsocketinterface.cpp b/libmea-core/tcpsocketinterface.cpp index 173e0cd4..b4ba38fc 100644 --- a/libmea-core/tcpsocketinterface.cpp +++ b/libmea-core/tcpsocketinterface.cpp @@ -23,7 +23,7 @@ QStringList TcpSocketInterface::supportedSchemes() const void TcpSocketInterface::sendData(const QByteArray &data) { - quint64 ret = m_socket.write(data); + qint64 ret = m_socket.write(data); if (ret != data.length()) { qWarning() << "Error writing data to socket."; } diff --git a/libmea-core/websocketinterface.h b/libmea-core/websocketinterface.h index 0e7a5bb8..4b8f762d 100644 --- a/libmea-core/websocketinterface.h +++ b/libmea-core/websocketinterface.h @@ -38,7 +38,7 @@ public: bool isConnected() const override; void disconnect() override; void sendData(const QByteArray &data) override; - void ignoreSslErrors(const QList &errors); + void ignoreSslErrors(const QList &errors) override; private: QWebSocket *m_socket; diff --git a/mea.pri b/mea.pri index 4ecb2afc..28520147 100644 --- a/mea.pri +++ b/mea.pri @@ -1,5 +1,6 @@ CONFIG += c++11 #DEFINES += QT_DEPRECATED_WARNINGS +QMAKE_CXXFLAGS += -Wall top_srcdir=$$PWD top_builddir=$$shadowed($$PWD)