diff --git a/libnymea-app/connection/networkreachabilitymonitor.cpp b/libnymea-app/connection/networkreachabilitymonitor.cpp index 2bdc5414..c46b9a21 100644 --- a/libnymea-app/connection/networkreachabilitymonitor.cpp +++ b/libnymea-app/connection/networkreachabilitymonitor.cpp @@ -28,9 +28,8 @@ NetworkReachabilityMonitor::NetworkReachabilityMonitor(QObject *parent) }); QGuiApplication *app = static_cast(QGuiApplication::instance()); - QObject::connect(app, &QGuiApplication::applicationStateChanged, this, [app, this](Qt::ApplicationState state) { + QObject::connect(app, &QGuiApplication::applicationStateChanged, this, [this](Qt::ApplicationState state) { qCDebug(dcNymeaConnection()) << "Application state changed to:" << state; - updateActiveBearers(); }); diff --git a/libnymea-app/connection/tunnelproxytransport.cpp b/libnymea-app/connection/tunnelproxytransport.cpp index c1748406..8f389f03 100644 --- a/libnymea-app/connection/tunnelproxytransport.cpp +++ b/libnymea-app/connection/tunnelproxytransport.cpp @@ -77,19 +77,24 @@ QUrl TunnelProxyTransport::url() const NymeaTransportInterface::ConnectionState TunnelProxyTransport::connectionState() const { + NymeaTransportInterface::ConnectionState state = NymeaTransportInterface::ConnectionStateDisconnected; switch (m_remoteConnection->state()) { case TunnelProxyRemoteConnection::StateRemoteConnected: - return NymeaTransportInterface::ConnectionStateConnected; + state = NymeaTransportInterface::ConnectionStateConnected; + break; case TunnelProxyRemoteConnection::StateConnecting: case TunnelProxyRemoteConnection::StateHostLookup: case TunnelProxyRemoteConnection::StateConnected: case TunnelProxyRemoteConnection::StateInitializing: case TunnelProxyRemoteConnection::StateRegister: - return NymeaTransportInterface::ConnectionStateConnecting; + state = NymeaTransportInterface::ConnectionStateConnecting; + break; case TunnelProxyRemoteConnection::StateDiconnecting: case TunnelProxyRemoteConnection::StateDisconnected: - return NymeaTransportInterface::ConnectionStateDisconnected; + state = NymeaTransportInterface::ConnectionStateDisconnected; + break; } + return state; } void TunnelProxyTransport::disconnect() diff --git a/libnymea-app/wifisetup/btwifisetup.cpp b/libnymea-app/wifisetup/btwifisetup.cpp index 3cfbe2c6..c8dd9942 100644 --- a/libnymea-app/wifisetup/btwifisetup.cpp +++ b/libnymea-app/wifisetup/btwifisetup.cpp @@ -334,11 +334,9 @@ void BtWiFiSetup::streamData(QLowEnergyService *service, const QUuid &characteri QLowEnergyCharacteristic characteristic = service->characteristic(characteristicUuid); QByteArray data = QJsonDocument::fromVariant(request).toJson(QJsonDocument::Compact) + '\n'; - int sentDataLength = 0; QByteArray remainingData = data; while (!remainingData.isEmpty()) { QByteArray package = remainingData.left(20); - sentDataLength += package.count(); m_wifiService->writeCharacteristic(characteristic, package); remainingData = remainingData.remove(0, package.count()); } diff --git a/libnymea-app/zwave/zwavenode.cpp b/libnymea-app/zwave/zwavenode.cpp index 8b06e310..929536e5 100644 --- a/libnymea-app/zwave/zwavenode.cpp +++ b/libnymea-app/zwave/zwavenode.cpp @@ -296,6 +296,8 @@ int ZWaveNodes::rowCount(const QModelIndex &parent) const QVariant ZWaveNodes::data(const QModelIndex &index, int role) const { + Q_UNUSED(index) + Q_UNUSED(role) return QVariant(); } diff --git a/nymea-app/nfcthingactionwriter.cpp b/nymea-app/nfcthingactionwriter.cpp index 6c5fb15a..8dd29156 100644 --- a/nymea-app/nfcthingactionwriter.cpp +++ b/nymea-app/nfcthingactionwriter.cpp @@ -137,10 +137,9 @@ void NfcThingActionWriter::updateContent() QNdefNfcUriRecord record; record.setUri(url); - QNdefMessage message; - message.append(record); - m_currentMessage = message; + m_currentMessage.clear(); + m_currentMessage.append(record); emit messageSizeChanged(); } diff --git a/shared.pri b/shared.pri index b2fb467c..c0486dee 100644 --- a/shared.pri +++ b/shared.pri @@ -1,4 +1,6 @@ -CONFIG += c++11 +CONFIG *= c++14 +QMAKE_LFLAGS *= -std=c++14 +QMAKE_CXXFLAGS *= -std=c++14 top_srcdir=$$PWD top_builddir=$$shadowed($$PWD)