summaryrefslogtreecommitdiffstats
path: root/configuredivecomputer.cpp
diff options
context:
space:
mode:
authorGravatar Joseph W. Joshua <joejoshw@gmail.com>2014-07-31 18:51:38 +0300
committerGravatar Thiago Macieira <thiago@macieira.org>2014-08-13 10:48:15 -0700
commit4e99382c96c71e5427a7f1ef011b04f0e560a1f6 (patch)
tree980b96d4133481a5d719d89f3bdc7c9ff56820fb /configuredivecomputer.cpp
parent24cb0b0496e8f593f22f3e1cd25b286ad8c7031f (diff)
downloadsubsurface-4e99382c96c71e5427a7f1ef011b04f0e560a1f6.tar.gz
Improve on error reporting in the ConfigureDiveComputer class
This patch improves on the error reporting for the dive computer configuration dialog to use config->lastError. The previous code was using a different argument in each function, which lacked uniformity. Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com> Signed-off-by: Thiago Macieira <thiago@macieira.org>
Diffstat (limited to 'configuredivecomputer.cpp')
-rw-r--r--configuredivecomputer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/configuredivecomputer.cpp b/configuredivecomputer.cpp
index fac603f84..5fe5a4a91 100644
--- a/configuredivecomputer.cpp
+++ b/configuredivecomputer.cpp
@@ -50,7 +50,7 @@ void ConfigureDiveComputer::saveDeviceDetails(DeviceDetails *details, device_dat
writeThread->start();
}
-bool ConfigureDiveComputer::saveXMLBackup(QString fileName, DeviceDetails *details, device_data_t *data, QString errorText)
+bool ConfigureDiveComputer::saveXMLBackup(QString fileName, DeviceDetails *details, device_data_t *data)
{
QString xml = "";
QString vendor = data->vendor;
@@ -187,7 +187,7 @@ bool ConfigureDiveComputer::saveXMLBackup(QString fileName, DeviceDetails *detai
writer.writeEndDocument();
QFile file(fileName);
if (!file.open(QIODevice::WriteOnly)) {
- errorText = tr("Could not save the backup file %1. Error Message: %2")
+ lastError = tr("Could not save the backup file %1. Error Message: %2")
.arg(fileName, file.errorString());
return false;
}
@@ -199,11 +199,11 @@ bool ConfigureDiveComputer::saveXMLBackup(QString fileName, DeviceDetails *detai
return true;
}
-bool ConfigureDiveComputer::restoreXMLBackup(QString fileName, DeviceDetails *details, QString errorText)
+bool ConfigureDiveComputer::restoreXMLBackup(QString fileName, DeviceDetails *details)
{
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly)) {
- errorText = tr("Could not open backup file: %1").arg(file.errorString());
+ lastError = tr("Could not open backup file: %1").arg(file.errorString());
return false;
}
@@ -401,7 +401,7 @@ bool ConfigureDiveComputer::restoreXMLBackup(QString fileName, DeviceDetails *de
return true;
}
-void ConfigureDiveComputer::startFirmwareUpdate(QString fileName, device_data_t *data, QString errorText)
+void ConfigureDiveComputer::startFirmwareUpdate(QString fileName, device_data_t *data)
{
}