mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Introduce helper function empty_string()

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2018-01-07 11:12:48 +01:00 • committed by Lubomir I. Ivanov
parent 86ef9fce75
commit e85ecdd925
21 changed files with 53 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -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

2
desktop-widgets/locationinformation.cpp
View file

@ -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);

2
desktop-widgets/mainwindow.cpp
View file

@ -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()));
}

4
desktop-widgets/subsurfacewebservices.cpp
View file

@ -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);