From 4f522d79d8646d5156729cee0b43050e59738316 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 12 Feb 2014 05:51:25 -0800 Subject: 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 --- qt-ui/downloadfromdivecomputer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'qt-ui/downloadfromdivecomputer.cpp') 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); } -- cgit v1.2.3-70-g09d2