From dcabe7452a5fff3711de654285ccdc6b770587ef Mon Sep 17 00:00:00 2001 From: Mate Barany Date: Mon, 3 Apr 2023 17:28:49 +0200 Subject: Fix compiler warnings in MQTT Subscription Example Fix some signed/unsigned conversion warnings. Add explicit QMqttSubscription::Unsubscription case. These warnings were reported by Visual Studio with the Wall compiler setting. Task-number: QTBUG-110893 Change-Id: Ief64c4a04ba679f52c3e256aa96bb8f239ae68e9 Reviewed-by: Maurice Kalinowski (cherry picked from commit 9e8dbb150938e82ec770d15f0daea5cb553a7bba) Reviewed-by: Qt Cherry-pick Bot --- examples/mqtt/subscriptions/mainwindow.cpp | 15 ++++++++------- examples/mqtt/subscriptions/subscriptionwindow.cpp | 3 +++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/examples/mqtt/subscriptions/mainwindow.cpp b/examples/mqtt/subscriptions/mainwindow.cpp index 67b60c0..dd0c03e 100644 --- a/examples/mqtt/subscriptions/mainwindow.cpp +++ b/examples/mqtt/subscriptions/mainwindow.cpp @@ -17,7 +17,7 @@ MainWindow::MainWindow(QWidget *parent) : m_client = new QMqttClient(this); m_client->setHostname(ui->lineEditHost->text()); - m_client->setPort(ui->spinBoxPort->value()); + m_client->setPort(static_cast(ui->spinBoxPort->value())); connect(m_client, &QMqttClient::stateChanged, this, &MainWindow::updateLogStateChange); connect(m_client, &QMqttClient::disconnected, this, &MainWindow::brokerDisconnected); @@ -96,21 +96,22 @@ void MainWindow::brokerDisconnected() void MainWindow::setClientPort(int p) { - m_client->setPort(p); + m_client->setPort(static_cast(p)); } void MainWindow::on_buttonPublish_clicked() { - if (m_client->publish(ui->lineEditTopic->text(), - ui->lineEditMessage->text().toUtf8(), - ui->spinQoS_2->text().toUInt(), - ui->checkBoxRetain->isChecked()) == -1) + if (m_client->publish(ui->lineEditTopic->text(), ui->lineEditMessage->text().toUtf8(), + static_cast(ui->spinQoS_2->text().toUInt()), + ui->checkBoxRetain->isChecked()) + == -1) QMessageBox::critical(this, QLatin1String("Error"), QLatin1String("Could not publish message")); } void MainWindow::on_buttonSubscribe_clicked() { - auto subscription = m_client->subscribe(ui->lineEditTopic->text(), ui->spinQoS->text().toUInt()); + auto subscription = m_client->subscribe(ui->lineEditTopic->text(), + static_cast(ui->spinQoS->text().toUInt())); if (!subscription) { QMessageBox::critical(this, QLatin1String("Error"), QLatin1String("Could not subscribe. Is there a valid connection?")); return; diff --git a/examples/mqtt/subscriptions/subscriptionwindow.cpp b/examples/mqtt/subscriptions/subscriptionwindow.cpp index e964a07..a387c62 100644 --- a/examples/mqtt/subscriptions/subscriptionwindow.cpp +++ b/examples/mqtt/subscriptions/subscriptionwindow.cpp @@ -48,6 +48,9 @@ void SubscriptionWindow::updateStatus(QMqttSubscription::SubscriptionState state case QMqttSubscription::Error: ui->labelStatus->setText(QLatin1String("Error")); break; + case QMqttSubscription::UnsubscriptionPending: + ui->labelStatus->setText(QLatin1String("Pending Unsubscription")); + break; default: ui->labelStatus->setText(QLatin1String("--Unknown--")); break; -- cgit v1.2.3