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

export: remove redundant QString::isNull() checks

Browse source 
If QString::isEmpty() is false, QString::isNull() is likewise
false, so these tests are redundant.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-04-29 21:19:26 +02:00 • committed by Dirk Hohndel
parent c34f0b88a2
commit 573de51e48
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
desktop-widgets/divelogexportdialog.cpp
View file

@ -161,12 +161,12 @@ void DiveLogExportDialog::on_buttonBox_accepted()
} else if (ui->exportWorldMap->isChecked()) { } else if (ui->exportWorldMap->isChecked()) {
filename = QFileDialog::getSaveFileName(this, tr("Export world map"), lastDir, filename = QFileDialog::getSaveFileName(this, tr("Export world map"), lastDir,
tr("HTML files") + " (*.html)"); tr("HTML files") + " (*.html)");
if (!filename.isNull() && !filename.isEmpty()) if (!filename.isEmpty())
export_worldmap_HTML(qPrintable(filename), ui->exportSelected->isChecked()); export_worldmap_HTML(qPrintable(filename), ui->exportSelected->isChecked());
} else if (ui->exportSubsurfaceXML->isChecked()) { } else if (ui->exportSubsurfaceXML->isChecked()) {
filename = QFileDialog::getSaveFileName(this, tr("Export Subsurface XML"), lastDir, filename = QFileDialog::getSaveFileName(this, tr("Export Subsurface XML"), lastDir,
tr("Subsurface files") + " (*.ssrf *.xml)"); tr("Subsurface files") + " (*.ssrf *.xml)");
if (!filename.isNull() && !filename.isEmpty()) { if (!filename.isEmpty()) {
if (!filename.contains('.')) if (!filename.contains('.'))
filename.append(".ssrf"); filename.append(".ssrf");
QByteArray bt = QFile::encodeName(filename); QByteArray bt = QFile::encodeName(filename);
@ -175,7 +175,7 @@ void DiveLogExportDialog::on_buttonBox_accepted()
} else if (ui->exportSubsurfaceSitesXML->isChecked()) { } else if (ui->exportSubsurfaceSitesXML->isChecked()) {
filename = QFileDialog::getSaveFileName(this, tr("Export Subsurface dive sites XML"), lastDir, filename = QFileDialog::getSaveFileName(this, tr("Export Subsurface dive sites XML"), lastDir,
tr("Subsurface files") + " (*.xml)"); tr("Subsurface files") + " (*.xml)");
if (!filename.isNull() && !filename.isEmpty()) { if (!filename.isEmpty()) {
if (!filename.contains('.')) if (!filename.contains('.'))
filename.append(".xml"); filename.append(".xml");
QByteArray bt = QFile::encodeName(filename); QByteArray bt = QFile::encodeName(filename);
@ -184,31 +184,31 @@ void DiveLogExportDialog::on_buttonBox_accepted()
} }
} else if (ui->exportImageDepths->isChecked()) { } else if (ui->exportImageDepths->isChecked()) {
filename = QFileDialog::getSaveFileName(this, tr("Save image depths"), lastDir); filename = QFileDialog::getSaveFileName(this, tr("Save image depths"), lastDir);
if (!filename.isNull() && !filename.isEmpty()) if (!filename.isEmpty())
export_depths(qPrintable(filename), ui->exportSelected->isChecked()); export_depths(qPrintable(filename), ui->exportSelected->isChecked());
} else if (ui->exportTeX->isChecked() || ui->exportLaTeX->isChecked()) { } else if (ui->exportTeX->isChecked() || ui->exportLaTeX->isChecked()) {
filename = QFileDialog::getSaveFileName(this, tr("Export to TeX file"), lastDir, tr("TeX files") + " (*.tex)"); filename = QFileDialog::getSaveFileName(this, tr("Export to TeX file"), lastDir, tr("TeX files") + " (*.tex)");
if (!filename.isNull() && !filename.isEmpty()) if (!filename.isEmpty())
export_TeX(qPrintable(filename), ui->exportSelected->isChecked(), ui->exportTeX->isChecked()); export_TeX(qPrintable(filename), ui->exportSelected->isChecked(), ui->exportTeX->isChecked());
} else if (ui->exportProfile->isChecked()) { } else if (ui->exportProfile->isChecked()) {
filename = QFileDialog::getSaveFileName(this, tr("Save profile image"), lastDir); filename = QFileDialog::getSaveFileName(this, tr("Save profile image"), lastDir);
if (!filename.isNull() && !filename.isEmpty()) if (!filename.isEmpty())
exportProfile(qPrintable(filename), ui->exportSelected->isChecked()); exportProfile(qPrintable(filename), ui->exportSelected->isChecked());
} else if (ui->exportProfileData->isChecked()) { } else if (ui->exportProfileData->isChecked()) {
filename = QFileDialog::getSaveFileName(this, tr("Save profile data"), lastDir); filename = QFileDialog::getSaveFileName(this, tr("Save profile data"), lastDir);
if (!filename.isNull() && !filename.isEmpty()) if (!filename.isEmpty())
save_profiledata(qPrintable(filename), ui->exportSelected->isChecked()); save_profiledata(qPrintable(filename), ui->exportSelected->isChecked());
} }
break; break;
case 1: case 1:
filename = QFileDialog::getSaveFileName(this, tr("Export HTML files as"), lastDir, filename = QFileDialog::getSaveFileName(this, tr("Export HTML files as"), lastDir,
tr("HTML files") + " (*.html)"); tr("HTML files") + " (*.html)");
if (!filename.isNull() && !filename.isEmpty()) if (!filename.isEmpty())
exportHtmlInit(filename); exportHtmlInit(filename);
break; break;
} }
if (!filename.isNull() && !filename.isEmpty()) { if (!filename.isEmpty()) {
// remember the last export path // remember the last export path
QFileInfo fileInfo(filename); QFileInfo fileInfo(filename);
qPrefDisplay::set_lastDir(fileInfo.dir().path()); qPrefDisplay::set_lastDir(fileInfo.dir().path());