ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/less-compile-warnings' into landing-silo

Browse Source
This commit is contained in:
Jenkins 2018-06-07 12:04:39 +02:00
commit 0457047802
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmea-core/devicediscovery.h
View File

@ -20,7 +20,7 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role) const override; QVariant data(const QModelIndex &index, int role) const override;
QHash<int, QByteArray> roleNames() const; QHash<int, QByteArray> roleNames() const override;
Q_INVOKABLE void discoverDevices(const QUuid &deviceClassId, const QVariantList &discoveryParams = {}); Q_INVOKABLE void discoverDevices(const QUuid &deviceClassId, const QVariantList &discoveryParams = {});

4
libmea-core/discovery/upnpdiscovery.cpp
View File

@ -104,7 +104,7 @@ void UpnpDiscovery::writeDiscoveryPacket()
// qDebug() << "sending discovery package"; // qDebug() << "sending discovery package";
foreach (QUdpSocket* socket, m_sockets) { 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()) { if (ret != ssdpSearchMessage.length()) {
qWarning() << "Error sending SSDP query on socket" << socket->localAddress(); qWarning() << "Error sending SSDP query on socket" << socket->localAddress();
} }
@ -165,7 +165,7 @@ void UpnpDiscovery::readData()
m_foundDevices.append(location); m_foundDevices.append(location);
qDebug() << "Getting server data from:" << location; qDebug() << "Getting server data from:" << location;
QNetworkReply *reply = m_networkAccessManager->get(QNetworkRequest(location)); QNetworkReply *reply = m_networkAccessManager->get(QNetworkRequest(location));
connect(reply, &QNetworkReply::sslErrors, [this, reply](const QList<QSslError> &errors){ connect(reply, &QNetworkReply::sslErrors, [reply](const QList<QSslError> &errors){
reply->ignoreSslErrors(errors); reply->ignoreSslErrors(errors);
}); });
m_runningReplies.insert(reply, hostAddress); m_runningReplies.insert(reply, hostAddress);

6
libmea-core/rulemanager.cpp
View File

@ -260,11 +260,11 @@ void RuleManager::parseRuleExitActions(const QVariantList &ruleActions, Rule *ru
void RuleManager::parseTimeDescriptor(const QVariantMap &timeDescriptor, Rule *rule) void RuleManager::parseTimeDescriptor(const QVariantMap &timeDescriptor, Rule *rule)
{ {
Q_UNUSED(rule) Q_UNUSED(rule)
Q_UNUSED(timeDescriptor)
foreach (const QVariant &timeEventItemVariant, timeDescriptor.value("timeEventItems").toList()) { // foreach (const QVariant &timeEventItemVariant, timeDescriptor.value("timeEventItems").toList()) {
// TimeEventItem *timeEventItem = new TimeEventItem(); // TimeEventItem *timeEventItem = new TimeEventItem();
// timeEventItem->setDateTime(QDateTime::fromSecsSinceEpoch(timeEventItemVariant.toMap().value("datetime").toULongLong())); // timeEventItem->setDateTime(QDateTime::fromSecsSinceEpoch(timeEventItemVariant.toMap().value("datetime").toULongLong()));
// timeEventItem->setTime(QTime::fromString(timeEventItemVariant.toMap().value("time").toString())); // timeEventItem->setTime(QTime::fromString(timeEventItemVariant.toMap().value("time").toString()));
// timeEventItem->setRepeatingOption(); // timeEventItem->setRepeatingOption();
} // }
} }

2
libmea-core/tcpsocketinterface.cpp
View File

@ -23,7 +23,7 @@ QStringList TcpSocketInterface::supportedSchemes() const
void TcpSocketInterface::sendData(const QByteArray &data) void TcpSocketInterface::sendData(const QByteArray &data)
{ {
quint64 ret = m_socket.write(data); qint64 ret = m_socket.write(data);
if (ret != data.length()) { if (ret != data.length()) {
qWarning() << "Error writing data to socket."; qWarning() << "Error writing data to socket.";
} }

2
libmea-core/websocketinterface.h
View File

@ -38,7 +38,7 @@ public:
bool isConnected() const override; bool isConnected() const override;
void disconnect() override; void disconnect() override;
void sendData(const QByteArray &data) override; void sendData(const QByteArray &data) override;
void ignoreSslErrors(const QList<QSslError> &errors); void ignoreSslErrors(const QList<QSslError> &errors) override;
private: private:
QWebSocket *m_socket; QWebSocket *m_socket;

1
mea.pri
View File

@ -1,5 +1,6 @@
CONFIG += c++11 CONFIG += c++11
#DEFINES += QT_DEPRECATED_WARNINGS #DEFINES += QT_DEPRECATED_WARNINGS
QMAKE_CXXFLAGS += -Wall
top_srcdir=$$PWD top_srcdir=$$PWD
top_builddir=$$shadowed($$PWD) top_builddir=$$shadowed($$PWD)