diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-01-07 11:12:48 +0100 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-01-11 06:07:13 +0100 |
| commit | e85ecdd9254a8bd222ccb2dfed7d3b3bb96c8294 (patch) | |
| tree | 0483cdb3c5770ca75eeeb0cc2de787b0e7bdbd3c /desktop-widgets | |
| parent | 86ef9fce7517313570838ca8e853132876035611 (diff) | |
| download | subsurface-e85ecdd9254a8bd222ccb2dfed7d3b3bb96c8294.tar.gz | |
Introduce helper function empty_string()
There are ca. 50 constructs of the kind
same_string(s, "")
to test for empty or null strings. Replace them by the new helper
function empty_string().
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/downloadfromdivecomputer.cpp | 6 | ||||
| -rw-r--r-- | desktop-widgets/locationinformation.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/subsurfacewebservices.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp index aeefb75a4..fce287665 100644 --- a/desktop-widgets/downloadfromdivecomputer.cpp +++ b/desktop-widgets/downloadfromdivecomputer.cpp @@ -112,13 +112,13 @@ void DownloadFromDCWidget::updateProgressBar() { static char *last_text = NULL; - if (same_string(last_text, "")) { + if (empty_string(last_text)) { // if we get the first actual text after the download is finished // (which happens for example on the OSTC), then don't bother - if (!same_string(progress_bar_text, "") && IS_FP_SAME(progress_bar_fraction, 1.0)) + if (!empty_string(progress_bar_text) && IS_FP_SAME(progress_bar_fraction, 1.0)) progress_bar_text = ""; } - if (!same_string(progress_bar_text , "")) { + if (!empty_string(progress_bar_text)) { ui.progressBar->setFormat(progress_bar_text); #if defined(Q_OS_MAC) // on mac the progress bar doesn't show its text diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index b8cbd689d..f968fd8fa 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -186,7 +186,7 @@ void LocationInformationWidget::acceptChanges() // if the user entered a different contriy, first update the taxonomy // for the displayed dive site; this below will get copied into the currentDs if (!same_string(uiString, taxonomy_get_country(&displayed_dive_site.taxonomy)) && - !same_string(uiString, "")) + !empty_string(uiString)) taxonomy_set_country(&displayed_dive_site.taxonomy, uiString, taxonomy_origin::GEOMANUAL); else free(uiString); diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 74eaaa60b..93df3aea9 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -1669,7 +1669,7 @@ int MainWindow::file_save_as(void) selection_dialog.setAcceptMode(QFileDialog::AcceptSave); selection_dialog.setFileMode(QFileDialog::AnyFile); selection_dialog.setDefaultSuffix(""); - if (same_string(default_filename, "")) { + if (empty_string(default_filename)) { QFileInfo defaultFile(system_default_filename()); selection_dialog.setDirectory(qPrintable(defaultFile.absolutePath())); } diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index c665ea78b..93398ae6c 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -272,8 +272,8 @@ SubsurfaceWebServices::SubsurfaceWebServices(QWidget *parent, Qt::WindowFlags f) QString userid(prefs.userid); if (userid.isEmpty() && - !same_string(prefs.cloud_storage_email, "") && - !same_string(prefs.cloud_storage_password, "") && + !empty_string(prefs.cloud_storage_email) && + !empty_string(prefs.cloud_storage_password) && GpsLocation::hasInstance()) userid = GpsLocation::instance()->getUserid(prefs.cloud_storage_email, prefs.cloud_storage_password); |