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

avoid duplicate and inconsistent applying of QDir::separator()

Browse source 
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
This commit is contained in:
Rolf Eike Beer 2019-03-22 21:33:17 +01:00 • committed by Dirk Hohndel
parent bf9a526d63
commit 9ea32a0158
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/divelogexportlogic.cpp
View file

@ -10,7 +10,7 @@
#include "statistics.h" #include "statistics.h"
#include "save-html.h" #include "save-html.h"
void file_copy_and_overwrite(const QString &fileName, const QString &newName) static void file_copy_and_overwrite(const QString &fileName, const QString &newName)
{ {
QFile file(newName); QFile file(newName);
if (file.exists()) if (file.exists())
@ -18,7 +18,7 @@ void file_copy_and_overwrite(const QString &fileName, const QString &newName)
QFile::copy(fileName, newName); QFile::copy(fileName, newName);
} }
void exportHTMLsettings(const QString &filename, struct htmlExportSetting &hes) static void exportHTMLsettings(const QString &filename, struct htmlExportSetting &hes)
{ {
QString fontSize = hes.fontSize; QString fontSize = hes.fontSize;
QString fontFamily = hes.fontFamily; QString fontFamily = hes.fontFamily;
@ -128,21 +128,19 @@ void exportHtmlInitLogic(const QString &filename, struct htmlExportSetting &hes)
QFile file(filename); QFile file(filename);
QFileInfo info(file); QFileInfo info(file);
QDir mainDir = info.absoluteDir(); QDir mainDir = info.absoluteDir();
mainDir.mkdir(file.fileName() + "_files"); QString exportFiles = file.fileName() + "_files" + QDir::separator();
QString exportFiles = file.fileName() + "_files"; mainDir.mkdir(exportFiles);
QString json_dive_data = exportFiles + QDir::separator() + "file.js"; QString json_dive_data = exportFiles + "file.js";
QString json_settings = exportFiles + QDir::separator() + "settings.js"; QString json_settings = exportFiles + "settings.js";
QString translation = exportFiles + QDir::separator() + "translation.js"; QString translation = exportFiles + "translation.js";
QString stat_file = exportFiles + QDir::separator() + "stat.js"; QString stat_file = exportFiles + "stat.js";
exportFiles += "/";
if (hes.exportPhotos) { if (hes.exportPhotos) {
photosDirectory = exportFiles + QDir::separator() + "photos" + QDir::separator(); photosDirectory = exportFiles + "photos" + QDir::separator();
mainDir.mkdir(photosDirectory); mainDir.mkdir(photosDirectory);
} }
exportHTMLsettings(json_settings, hes); exportHTMLsettings(json_settings, hes);
exportHTMLstatistics(stat_file, hes); exportHTMLstatistics(stat_file, hes);
export_translation(qPrintable(translation)); export_translation(qPrintable(translation));

1
core/divelogexportlogic.h
View file

@ -14,7 +14,6 @@ struct htmlExportSetting {
QString themeFile; QString themeFile;
}; };
void file_copy_and_overwrite(const QString &fileName, const QString &newName);
void exportHtmlInitLogic(const QString &filename, struct htmlExportSetting &hes); void exportHtmlInitLogic(const QString &filename, struct htmlExportSetting &hes);
#endif // DIVELOGEXPORTLOGIC_H #endif // DIVELOGEXPORTLOGIC_H