summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@qt.io>2019-10-23 11:39:32 +0200
committerMaurice Kalinowski <maurice.kalinowski@qt.io>2019-10-24 16:36:06 +0200
commit450f2b3dd32e6b8374f404dbc2968f31bcbc3be7 (patch)
treefaa346e632c14367ab8f060af19bce1f2bf67529 /examples
parente7d71199ff5997d45735c5ebe1a5f05ca6aa7b51 (diff)
Examples: Remove ping buttons
Since dcf3bbb9802f9adf79ae08d5d697b3ded3f0cb97 introduced autoKeepAlive, users should not send a ping message manually unless it is disabled. Change-Id: I4b717e2aebc8f40cabf009d4df7e1d146988d434 Fixes: QTBUG-79444 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/mqtt/simpleclient/mainwindow.cpp7
-rw-r--r--examples/mqtt/simpleclient/mainwindow.h2
-rw-r--r--examples/mqtt/simpleclient/mainwindow.ui39
-rw-r--r--examples/mqtt/subscriptions/mainwindow.cpp7
-rw-r--r--examples/mqtt/subscriptions/mainwindow.h2
-rw-r--r--examples/mqtt/subscriptions/mainwindow.ui7
6 files changed, 16 insertions, 48 deletions
diff --git a/examples/mqtt/simpleclient/mainwindow.cpp b/examples/mqtt/simpleclient/mainwindow.cpp
index e40820b..dcf344c 100644
--- a/examples/mqtt/simpleclient/mainwindow.cpp
+++ b/examples/mqtt/simpleclient/mainwindow.cpp
@@ -79,7 +79,6 @@ MainWindow::MainWindow(QWidget *parent) :
});
connect(m_client, &QMqttClient::pingResponseReceived, this, [this]() {
- ui->buttonPing->setEnabled(true);
const QString content = QDateTime::currentDateTime().toString()
+ QLatin1String(" PingResponse")
+ QLatin1Char('\n');
@@ -151,9 +150,3 @@ void MainWindow::on_buttonSubscribe_clicked()
return;
}
}
-
-void MainWindow::on_buttonPing_clicked()
-{
- ui->buttonPing->setEnabled(false);
- m_client->requestPing();
-}
diff --git a/examples/mqtt/simpleclient/mainwindow.h b/examples/mqtt/simpleclient/mainwindow.h
index 039f64a..601dafd 100644
--- a/examples/mqtt/simpleclient/mainwindow.h
+++ b/examples/mqtt/simpleclient/mainwindow.h
@@ -82,8 +82,6 @@ private slots:
void on_buttonSubscribe_clicked();
- void on_buttonPing_clicked();
-
private:
Ui::MainWindow *ui;
QMqttClient *m_client;
diff --git a/examples/mqtt/simpleclient/mainwindow.ui b/examples/mqtt/simpleclient/mainwindow.ui
index 4e4f6ce..564dc79 100644
--- a/examples/mqtt/simpleclient/mainwindow.ui
+++ b/examples/mqtt/simpleclient/mainwindow.ui
@@ -63,17 +63,10 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="1">
- <widget class="QLineEdit" name="lineEditTopic">
- <property name="text">
- <string>qtmqtt/topic1</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_3">
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lineEditMessage">
<property name="text">
- <string>Topic:</string>
+ <string>This is a test message</string>
</property>
</widget>
</item>
@@ -84,31 +77,31 @@
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QPushButton" name="buttonPublish">
+ <item row="0" column="2">
+ <widget class="QPushButton" name="buttonSubscribe">
<property name="text">
- <string>Publish</string>
+ <string>Subscribe</string>
</property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="QPushButton" name="buttonSubscribe">
+ <item row="1" column="2">
+ <widget class="QPushButton" name="buttonPublish">
<property name="text">
- <string>Subscribe</string>
+ <string>Publish</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="lineEditMessage">
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lineEditTopic">
<property name="text">
- <string>This is a test message</string>
+ <string>qtmqtt/topic1</string>
</property>
</widget>
</item>
- <item row="2" column="2">
- <widget class="QPushButton" name="buttonPing">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
<property name="text">
- <string>Ping</string>
+ <string>Topic:</string>
</property>
</widget>
</item>
@@ -158,7 +151,7 @@
<x>0</x>
<y>0</y>
<width>1024</width>
- <height>21</height>
+ <height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
diff --git a/examples/mqtt/subscriptions/mainwindow.cpp b/examples/mqtt/subscriptions/mainwindow.cpp
index e75483f..9bb2c76 100644
--- a/examples/mqtt/subscriptions/mainwindow.cpp
+++ b/examples/mqtt/subscriptions/mainwindow.cpp
@@ -80,7 +80,6 @@ MainWindow::MainWindow(QWidget *parent) :
});
connect(m_client, &QMqttClient::pingResponseReceived, this, [this]() {
- ui->buttonPing->setEnabled(true);
const QString content = QDateTime::currentDateTime().toString()
+ QLatin1String(" PingResponse")
+ QLatin1Char('\n');
@@ -167,9 +166,3 @@ void MainWindow::on_buttonSubscribe_clicked()
subWindow->setWindowTitle(subscription->topic().filter());
subWindow->show();
}
-
-void MainWindow::on_buttonPing_clicked()
-{
- ui->buttonPing->setEnabled(false);
- m_client->requestPing();
-}
diff --git a/examples/mqtt/subscriptions/mainwindow.h b/examples/mqtt/subscriptions/mainwindow.h
index 9309e67..05447fb 100644
--- a/examples/mqtt/subscriptions/mainwindow.h
+++ b/examples/mqtt/subscriptions/mainwindow.h
@@ -83,8 +83,6 @@ private slots:
void on_buttonSubscribe_clicked();
- void on_buttonPing_clicked();
-
private:
Ui::MainWindow *ui;
QMqttClient *m_client;
diff --git a/examples/mqtt/subscriptions/mainwindow.ui b/examples/mqtt/subscriptions/mainwindow.ui
index 0b627aa..07cbf3f 100644
--- a/examples/mqtt/subscriptions/mainwindow.ui
+++ b/examples/mqtt/subscriptions/mainwindow.ui
@@ -37,13 +37,6 @@
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QPushButton" name="buttonPing">
- <property name="text">
- <string>Ping</string>
- </property>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">