[PATCH 2/2] Emit the successful message the right way
Anton Lundin
glance at acc.umu.se
Sun Dec 7 14:32:08 PST 2014
The successful message was emitted in a some what older way then the
other messages so it was always emitted, even on error.
Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
configuredivecomputer.cpp | 5 ++++-
configuredivecomputer.h | 2 --
qt-ui/configuredivecomputerdialog.cpp | 6 ------
qt-ui/configuredivecomputerdialog.h | 1 -
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/configuredivecomputer.cpp b/configuredivecomputer.cpp
index ad4430c..769189b 100644
--- a/configuredivecomputer.cpp
+++ b/configuredivecomputer.cpp
@@ -556,7 +556,10 @@ void ConfigureDiveComputer::setError(QString err)
void ConfigureDiveComputer::readThreadFinished()
{
setState(DONE);
- emit readFinished();
+ if (readThread->lastError.isEmpty()) {
+ //No error
+ emit message(tr("Dive computer details read successfully"));
+ }
}
void ConfigureDiveComputer::writeThreadFinished()
diff --git a/configuredivecomputer.h b/configuredivecomputer.h
index 93c50f9..5934033 100644
--- a/configuredivecomputer.h
+++ b/configuredivecomputer.h
@@ -41,8 +41,6 @@ public:
signals:
void message(QString msg);
void error(QString err);
- void readFinished();
- void writeFinished();
void stateChanged(states newState);
void deviceDetailsChanged(DeviceDetails *newDetails);
diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp
index 4b66499..7349520 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/qt-ui/configuredivecomputerdialog.cpp
@@ -111,7 +111,6 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) :
config = new ConfigureDiveComputer(this);
connect(config, SIGNAL(error(QString)), this, SLOT(configError(QString)));
connect(config, SIGNAL(message(QString)), this, SLOT(configMessage(QString)));
- connect(config, SIGNAL(readFinished()), this, SLOT(deviceReadFinished()));
connect(config, SIGNAL(deviceDetailsChanged(DeviceDetails*)),
this, SLOT(deviceDetailsReceived(DeviceDetails*)));
connect(ui.retrieveDetails, SIGNAL(clicked()), this, SLOT(readSettings()));
@@ -616,11 +615,6 @@ void ConfigureDiveComputerDialog::on_cancel_clicked()
this->close();
}
-void ConfigureDiveComputerDialog::deviceReadFinished()
-{
- ui.statusLabel->setText(tr("Dive computer details read successfully."));
-}
-
void ConfigureDiveComputerDialog::on_saveSettingsPushButton_clicked()
{
populateDeviceDetails();
diff --git a/qt-ui/configuredivecomputerdialog.h b/qt-ui/configuredivecomputerdialog.h
index 89efee6..2f7fc29 100644
--- a/qt-ui/configuredivecomputerdialog.h
+++ b/qt-ui/configuredivecomputerdialog.h
@@ -62,7 +62,6 @@ private slots:
void configMessage(QString msg);
void configError(QString err);
void on_cancel_clicked();
- void deviceReadFinished();
void on_saveSettingsPushButton_clicked();
void deviceDetailsReceived(DeviceDetails *newDeviceDetails);
void reloadValues();
--
2.1.0
More information about the subsurface
mailing list