From 293d435346812fa1a4589b1d64c381ce0214017c Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 5 Jan 2021 17:47:21 +0100 Subject: [PATCH] Clean up warnings in code --- config.pri | 7 +++++-- libnymea-app/configuration/nymeaconfiguration.cpp | 3 +++ libnymea-app/connection/nymeaconnection.cpp | 2 +- libnymea-app/connection/nymeahosts.cpp | 1 + libnymea-app/connection/sigv4utils.cpp | 6 +++--- libnymea-app/connection/sigv4utils.h | 2 +- libnymea-app/models/logsmodelng.cpp | 1 + libnymea-app/rulemanager.cpp | 1 + libnymea-app/system/systemcontroller.cpp | 2 ++ nymea-app/nfcthingactionwriter.cpp | 6 +----- nymea-app/nymea-app.pro | 2 ++ nymea-app/pushnotifications.cpp | 2 +- 12 files changed, 22 insertions(+), 13 deletions(-) diff --git a/config.pri b/config.pri index 3ffae0bc..b9b40ac9 100644 --- a/config.pri +++ b/config.pri @@ -1,6 +1,9 @@ CONFIG += c++11 -#DEFINES += QT_DEPRECATED_WARNINGS -QMAKE_CXXFLAGS += -Wall + +# We want -Wall to keep the code clean and tidy, however: +# On Windows, -Wall goes mental, so not using it there +# As of Qt 5.15, lots of things are deprecated inside Qt in preparation for Qt6 but no replacement to actually fix those yet. +!win32:QMAKE_CXXFLAGS += -Wall -Wno-deprecated-declarations -Wno-deprecated-copy top_srcdir=$$PWD top_builddir=$$shadowed($$PWD) diff --git a/libnymea-app/configuration/nymeaconfiguration.cpp b/libnymea-app/configuration/nymeaconfiguration.cpp index ce4472cd..ee08f4df 100644 --- a/libnymea-app/configuration/nymeaconfiguration.cpp +++ b/libnymea-app/configuration/nymeaconfiguration.cpp @@ -254,6 +254,7 @@ void NymeaConfiguration::deleteMqttPolicy(const QString &clientId) void NymeaConfiguration::getConfigurationsResponse(int commandId, const QVariantMap ¶ms) { + Q_UNUSED(commandId) // qDebug() << "have config reply" << params; QVariantMap basicConfig = params.value("basicConfiguration").toMap(); m_debugServerEnabled = basicConfig.value("debugServerEnabled").toBool(); @@ -344,6 +345,7 @@ void NymeaConfiguration::deleteWebSocketConfigReply(int commandId, const QVarian void NymeaConfiguration::getMqttServerConfigsReply(int commandId, const QVariantMap ¶ms) { + Q_UNUSED(commandId) m_mqttServerConfigurations->clear(); foreach (const QVariant &mqttServerVariant, params.value("mqttServerConfigurations").toList()) { QVariantMap mqttConfigMap = mqttServerVariant.toMap(); @@ -364,6 +366,7 @@ void NymeaConfiguration::deleteMqttConfigReply(int commandId, const QVariantMap void NymeaConfiguration::getMqttPoliciesReply(int commandId, const QVariantMap ¶ms) { + Q_UNUSED(commandId) // qDebug() << "Mqtt polices:" << params; m_mqttPolicies->clear(); foreach (const QVariant &policyVariant, params.value("mqttPolicies").toList()) { diff --git a/libnymea-app/connection/nymeaconnection.cpp b/libnymea-app/connection/nymeaconnection.cpp index 1648b2d5..000c0243 100644 --- a/libnymea-app/connection/nymeaconnection.cpp +++ b/libnymea-app/connection/nymeaconnection.cpp @@ -61,7 +61,7 @@ NymeaConnection::NymeaConnection(QObject *parent) : QObject(parent) }); QGuiApplication *app = static_cast(QGuiApplication::instance()); - QObject::connect(app, &QGuiApplication::applicationStateChanged, this, [this](Qt::ApplicationState state) { + QObject::connect(app, &QGuiApplication::applicationStateChanged, this, [this](Qt::ApplicationState /*state*/) { // qDebug() << "Application state changed to:" << state; updateActiveBearers(); }); diff --git a/libnymea-app/connection/nymeahosts.cpp b/libnymea-app/connection/nymeahosts.cpp index 6ed0c14f..a27d7e8a 100644 --- a/libnymea-app/connection/nymeahosts.cpp +++ b/libnymea-app/connection/nymeahosts.cpp @@ -267,6 +267,7 @@ bool NymeaHostsFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &s hasReachableConnection |= m_jsonRpcClient->availableBearerTypes().testFlag(NymeaConnection::BearerTypeBluetooth); break; case Connection::BearerTypeUnknown: + case Connection::BearerTypeLoopback: hasReachableConnection = true; break; case Connection::BearerTypeNone: diff --git a/libnymea-app/connection/sigv4utils.cpp b/libnymea-app/connection/sigv4utils.cpp index 9c9ee446..04d5d91c 100644 --- a/libnymea-app/connection/sigv4utils.cpp +++ b/libnymea-app/connection/sigv4utils.cpp @@ -76,7 +76,7 @@ QByteArray SigV4Utils::getCanonicalQueryString(const QNetworkRequest &request, c { QByteArray algorithm = "AWS4-HMAC-SHA256"; QByteArray dateTime = getCurrentDateTime(); - QByteArray credentialScope = getCredentialScope(algorithm, dateTime, region, service); + QByteArray credentialScope = getCredentialScope(dateTime, region, service); QByteArray canonicalQueryString; canonicalQueryString += "X-Amz-Algorithm=AWS4-HMAC-SHA256"; @@ -148,7 +148,7 @@ QByteArray SigV4Utils::getCanonicalRequest(QNetworkAccessManager::Operation oper return canonicalRequest; } -QByteArray SigV4Utils::getCredentialScope(const QByteArray &algorithm, const QByteArray &dateTime, const QByteArray ®ion, const QByteArray &service) +QByteArray SigV4Utils::getCredentialScope(const QByteArray &dateTime, const QByteArray ®ion, const QByteArray &service) { QByteArray credentialScope = dateTime.left(8) + '/' + region + '/' + service + "/aws4_request"; return credentialScope; @@ -157,7 +157,7 @@ QByteArray SigV4Utils::getCredentialScope(const QByteArray &algorithm, const QBy QByteArray SigV4Utils::getStringToSign(const QByteArray &canonicalRequest, const QByteArray &dateTime, const QByteArray ®ion, const QByteArray &service) { QByteArray algorithm = "AWS4-HMAC-SHA256"; - QByteArray credentialScope = getCredentialScope(algorithm, dateTime, region, service); + QByteArray credentialScope = getCredentialScope(dateTime, region, service); QByteArray stringToSign = algorithm + '\n' + dateTime + '\n' + credentialScope + '\n' + QCryptographicHash::hash(canonicalRequest, QCryptographicHash::Sha256).toHex(); return stringToSign; diff --git a/libnymea-app/connection/sigv4utils.h b/libnymea-app/connection/sigv4utils.h index 249f4b5c..c0198638 100644 --- a/libnymea-app/connection/sigv4utils.h +++ b/libnymea-app/connection/sigv4utils.h @@ -50,7 +50,7 @@ public: static QByteArray getCanonicalQueryString(const QNetworkRequest &request, const QByteArray &accessKeyId, const QByteArray &secretAccessKey, const QByteArray &sessionToken, const QByteArray ®ion, const QByteArray &service, const QByteArray &payload); static QByteArray getCanonicalRequest(QNetworkAccessManager::Operation operation, const QNetworkRequest &request, const QByteArray &payload); static QByteArray getCanonicalHeaders(const QNetworkRequest &request); - static QByteArray getCredentialScope(const QByteArray &algorithm, const QByteArray &dateTime, const QByteArray ®ion, const QByteArray &service); + static QByteArray getCredentialScope(const QByteArray &dateTime, const QByteArray ®ion, const QByteArray &service); static QByteArray getStringToSign(const QByteArray &canonicalRequest, const QByteArray &dateTime, const QByteArray ®ion, const QByteArray &service); static QByteArray getSignatureKey(const QByteArray &key, const QByteArray &date, const QByteArray ®ion, const QByteArray &service); static QByteArray getSignature(const QByteArray &stringToSign, const QByteArray &secretAccessKey, const QByteArray &dateTime, const QString ®ion, const QString &service); diff --git a/libnymea-app/models/logsmodelng.cpp b/libnymea-app/models/logsmodelng.cpp index d9585380..972546ab 100644 --- a/libnymea-app/models/logsmodelng.cpp +++ b/libnymea-app/models/logsmodelng.cpp @@ -239,6 +239,7 @@ LogEntry *LogsModelNg::get(int index) const void LogsModelNg::logsReply(int commandId, const QVariantMap &data) { + Q_UNUSED(commandId) int offset = data.value("offset").toInt(); int count = data.value("count").toInt(); diff --git a/libnymea-app/rulemanager.cpp b/libnymea-app/rulemanager.cpp index 5747faf2..ce9f66b0 100644 --- a/libnymea-app/rulemanager.cpp +++ b/libnymea-app/rulemanager.cpp @@ -177,6 +177,7 @@ void RuleManager::getRulesReply(int /*commandId*/, const QVariantMap ¶ms) void RuleManager::getRuleDetailsReply(int commandId, const QVariantMap ¶ms) { + Q_UNUSED(commandId) QVariantMap ruleMap = params.value("rule").toMap(); Rule* rule = m_rules->getRule(ruleMap.value("id").toUuid()); if (!rule) { diff --git a/libnymea-app/system/systemcontroller.cpp b/libnymea-app/system/systemcontroller.cpp index 2a4925d2..a393b8eb 100644 --- a/libnymea-app/system/systemcontroller.cpp +++ b/libnymea-app/system/systemcontroller.cpp @@ -236,6 +236,7 @@ void SystemController::getUpdateStatusResponse(int /*commandId*/, const QVariant void SystemController::getPackagesResponse(int commandId, const QVariantMap &data) { + Q_UNUSED(commandId) foreach (const QVariant &packageVariant, data.value("packages").toList()) { QString id = packageVariant.toMap().value("id").toString(); QString displayName = packageVariant.toMap().value("displayName").toString(); @@ -275,6 +276,7 @@ void SystemController::enableRepositoryResponse(int commandId, const QVariantMap void SystemController::getServerTimeResponse(int commandId, const QVariantMap ¶ms) { + Q_UNUSED(commandId) m_serverTime = QDateTime::fromSecsSinceEpoch(params.value("time").toUInt()); // NOTE: Ideally we'd just set the TimeZone of our serverTime prooperly, however, there's a bug on Android diff --git a/nymea-app/nfcthingactionwriter.cpp b/nymea-app/nfcthingactionwriter.cpp index 920fcca6..1214ffed 100644 --- a/nymea-app/nfcthingactionwriter.cpp +++ b/nymea-app/nfcthingactionwriter.cpp @@ -72,11 +72,6 @@ RuleActions *NfcThingActionWriter::actions() const int NfcThingActionWriter::messageSize() const { return m_currentMessage.toByteArray().size(); - int ret = 0; - for (int i = 0; i < m_currentMessage.size(); i++) { - ret += m_currentMessage.at(i).payload().size(); - } - return ret; } NfcThingActionWriter::TagStatus NfcThingActionWriter::status() const @@ -155,6 +150,7 @@ void NfcThingActionWriter::targetDetected(QNearFieldTarget *target) QDateTime startTime = QDateTime::currentDateTime(); qDebug() << "target detected"; connect(target, &QNearFieldTarget::error, this, [=](QNearFieldTarget::Error error, const QNearFieldTarget::RequestId &id){ + Q_UNUSED(id) qDebug() << "Tag error:" << error; m_status = TagStatusFailed; emit statusChanged(); diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index ce2a2fa4..1fdd2c71 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -9,6 +9,8 @@ LIBS += -L$$top_builddir/libnymea-app/ -lnymea-app win32:Debug:LIBS += -L$$top_builddir/libnymea-app/debug win32:Release:LIBS += -L$$top_builddir/libnymea-app/release +win32:CXX_FLAGS += /w + linux:!android:!nozeroconf:LIBS += -lavahi-client -lavahi-common PRE_TARGETDEPS += ../libnymea-app diff --git a/nymea-app/pushnotifications.cpp b/nymea-app/pushnotifications.cpp index 069d7fb9..1fb71631 100644 --- a/nymea-app/pushnotifications.cpp +++ b/nymea-app/pushnotifications.cpp @@ -107,7 +107,7 @@ QString PushNotifications::clientId() const { QString branding; #if defined BRANDING - branding = "-" + BRANDING; + branding = QString("-%1").arg(BRANDING); #endif return PlatformHelper::instance()->deviceSerial() + "+io.guh.nymeaapp" + branding; }