summaryrefslogtreecommitdiffstats
path: root/qt-ui/downloadfromdivecomputer.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-02-12 05:51:25 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-02-12 05:51:25 -0800
commit4f522d79d8646d5156729cee0b43050e59738316 (patch)
tree5201ace3dbea41a89d2792ddd9bd9c73d3d54278 /qt-ui/downloadfromdivecomputer.cpp
parent11559f1704921aa384bde66667d33c34731efa7d (diff)
downloadsubsurface-4f522d79d8646d5156729cee0b43050e59738316.tar.gz
Don't shadow object members like this
If you need to use this->error to distinguish the local variable from the object membe that should be a hint that maybe you didn't pick the best name for the local variable. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/downloadfromdivecomputer.cpp')
-rw-r--r--qt-ui/downloadfromdivecomputer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp
index 3a6cb4237..d32112224 100644
--- a/qt-ui/downloadfromdivecomputer.cpp
+++ b/qt-ui/downloadfromdivecomputer.cpp
@@ -421,12 +421,12 @@ static QString str_error(const char *fmt, ...)
void DownloadThread::run()
{
- const char *error;
+ const char *errorText;
import_thread_cancelled = false;
if (!strcmp(data->vendor, "Uemis"))
- error = do_uemis_import(data->devname, data->force_download);
+ errorText = do_uemis_import(data->devname, data->force_download);
else
- error = do_libdivecomputer_import(data);
- if (error)
- this->error = str_error(error, data->devname, data->vendor, data->product);
+ errorText = do_libdivecomputer_import(data);
+ if (errorText)
+ error = str_error(errorText, data->devname, data->vendor, data->product);
}