From 4682a0882f02c50b20aa3c4bf9abe9f7ec2e834b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 24 Mar 2022 16:33:32 +1100 Subject: Cleanup: use "filepath" instead of "filename" for full paths Reserve "filename" when only the name component is used. --- source/blender/io/gpencil/gpencil_io.h | 4 ++-- source/blender/io/gpencil/intern/gpencil_io_base.cc | 6 +++--- source/blender/io/gpencil/intern/gpencil_io_base.hh | 6 +++--- source/blender/io/gpencil/intern/gpencil_io_capi.cc | 12 ++++++------ .../blender/io/gpencil/intern/gpencil_io_export_pdf.cc | 16 ++++++++-------- .../blender/io/gpencil/intern/gpencil_io_export_pdf.hh | 2 +- .../blender/io/gpencil/intern/gpencil_io_export_svg.cc | 16 ++++++++-------- .../blender/io/gpencil/intern/gpencil_io_export_svg.hh | 2 +- .../blender/io/gpencil/intern/gpencil_io_import_svg.cc | 6 +++--- .../blender/io/gpencil/intern/gpencil_io_import_svg.hh | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) (limited to 'source/blender/io/gpencil') diff --git a/source/blender/io/gpencil/gpencil_io.h b/source/blender/io/gpencil/gpencil_io.h index 6cd9fe087a6..215891e3e48 100644 --- a/source/blender/io/gpencil/gpencil_io.h +++ b/source/blender/io/gpencil/gpencil_io.h @@ -72,11 +72,11 @@ typedef enum eGpencilExportFrame { /** * Main export entry point function. */ -bool gpencil_io_export(const char *filename, struct GpencilIOParams *iparams); +bool gpencil_io_export(const char *filepath, struct GpencilIOParams *iparams); /** * Main import entry point function. */ -bool gpencil_io_import(const char *filename, struct GpencilIOParams *iparams); +bool gpencil_io_import(const char *filepath, struct GpencilIOParams *iparams); #ifdef __cplusplus } diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc index 9379e72bdd9..05f1158c57d 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_base.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc @@ -174,10 +174,10 @@ void GpencilIO::create_object_list() }); } -void GpencilIO::filename_set(const char *filename) +void GpencilIO::filepath_set(const char *filepath) { - BLI_strncpy(filename_, filename, FILE_MAX); - BLI_path_abs(filename_, BKE_main_blendfile_path(bmain_)); + BLI_strncpy(filepath_, filepath, FILE_MAX); + BLI_path_abs(filepath_, BKE_main_blendfile_path(bmain_)); } bool GpencilIO::gpencil_3D_point_to_screen_space(const float3 co, float2 &r_co) diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.hh b/source/blender/io/gpencil/intern/gpencil_io_base.hh index 96ba49c31b1..a89b723ed6c 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_base.hh +++ b/source/blender/io/gpencil/intern/gpencil_io_base.hh @@ -40,7 +40,7 @@ class GpencilIO { bool invert_axis_[2]; float4x4 diff_mat_; - char filename_[FILE_MAX]; + char filepath_[FILE_MAX]; /* Used for sorting objects. */ struct ObjectZ { @@ -94,9 +94,9 @@ class GpencilIO { void selected_objects_boundbox_get(rctf *boundbox); /** * Set file input_text full path. - * \param filename: Path of the file provided by save dialog. + * \param filepath: Path of the file provided by save dialog. */ - void filename_set(const char *filename); + void filepath_set(const char *filepath); private: float avg_opacity_; diff --git a/source/blender/io/gpencil/intern/gpencil_io_capi.cc b/source/blender/io/gpencil/intern/gpencil_io_capi.cc index 5acac885a38..84b273bc570 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_capi.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_capi.cc @@ -161,32 +161,32 @@ static bool gpencil_io_export_frame_svg(GpencilExporterSVG *exporter, } #endif -bool gpencil_io_import(const char *filename, GpencilIOParams *iparams) +bool gpencil_io_import(const char *filepath, GpencilIOParams *iparams) { - GpencilImporterSVG importer = GpencilImporterSVG(filename, iparams); + GpencilImporterSVG importer = GpencilImporterSVG(filepath, iparams); return gpencil_io_import_frame(&importer, *iparams); } -bool gpencil_io_export(const char *filename, GpencilIOParams *iparams) +bool gpencil_io_export(const char *filepath, GpencilIOParams *iparams) { Depsgraph *depsgraph_ = CTX_data_depsgraph_pointer(iparams->C); Scene *scene_ = CTX_data_scene(iparams->C); Object *ob = CTX_data_active_object(iparams->C); - UNUSED_VARS(filename, depsgraph_, scene_, ob); + UNUSED_VARS(filepath, depsgraph_, scene_, ob); switch (iparams->mode) { #ifdef WITH_PUGIXML case GP_EXPORT_TO_SVG: { - GpencilExporterSVG exporter = GpencilExporterSVG(filename, iparams); + GpencilExporterSVG exporter = GpencilExporterSVG(filepath, iparams); return gpencil_io_export_frame_svg(&exporter, scene_, iparams, true, true, true); break; } #endif #ifdef WITH_HARU case GP_EXPORT_TO_PDF: { - GpencilExporterPDF exporter = GpencilExporterPDF(filename, iparams); + GpencilExporterPDF exporter = GpencilExporterPDF(filepath, iparams); return gpencil_io_export_pdf(depsgraph_, scene_, ob, &exporter, iparams); break; } diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc index cc3eab02e07..205ab788e6d 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc @@ -43,10 +43,10 @@ static void error_handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void *UNU } /* Constructor. */ -GpencilExporterPDF::GpencilExporterPDF(const char *filename, const GpencilIOParams *iparams) +GpencilExporterPDF::GpencilExporterPDF(const char *filepath, const GpencilIOParams *iparams) : GpencilExporter(iparams) { - filename_set(filename); + filepath_set(filepath); invert_axis_[0] = false; invert_axis_[1] = false; @@ -78,16 +78,16 @@ bool GpencilExporterPDF::write() /* TODO: It looks `libharu` does not support unicode. */ #if 0 /* `ifdef WIN32` */ - char filename_cstr[FILE_MAX]; - BLI_strncpy(filename_cstr, filename_, FILE_MAX); + char filepath_cstr[FILE_MAX]; + BLI_strncpy(filepath_cstr, filepath_, FILE_MAX); - UTF16_ENCODE(filename_cstr); - std::wstring wstr(filename_cstr_16); + UTF16_ENCODE(filepath_cstr); + std::wstring wstr(filepath_cstr_16); res = HPDF_SaveToFile(pdf_, wstr.c_str()); - UTF16_UN_ENCODE(filename_cstr); + UTF16_UN_ENCODE(filepath_cstr); #else - res = HPDF_SaveToFile(pdf_, filename_); + res = HPDF_SaveToFile(pdf_, filepath_); #endif return (res == 0) ? true : false; diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.hh b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.hh index f6b9fe4fec1..bfec6bc506b 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.hh +++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.hh @@ -21,7 +21,7 @@ namespace blender::io::gpencil { class GpencilExporterPDF : public GpencilExporter { public: - GpencilExporterPDF(const char *filename, const struct GpencilIOParams *iparams); + GpencilExporterPDF(const char *filepath, const struct GpencilIOParams *iparams); bool new_document(); bool add_newpage(); bool add_body(); diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc index f8d30546e39..5d33a2806bd 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc @@ -40,10 +40,10 @@ namespace blender ::io ::gpencil { /* Constructor. */ -GpencilExporterSVG::GpencilExporterSVG(const char *filename, const GpencilIOParams *iparams) +GpencilExporterSVG::GpencilExporterSVG(const char *filepath, const GpencilIOParams *iparams) : GpencilExporter(iparams) { - filename_set(filename); + filepath_set(filepath); invert_axis_[0] = false; invert_axis_[1] = true; @@ -66,16 +66,16 @@ bool GpencilExporterSVG::write() bool result = true; /* Support unicode character paths on Windows. */ #ifdef WIN32 - char filename_cstr[FILE_MAX]; - BLI_strncpy(filename_cstr, filename_, FILE_MAX); + char filepath_cstr[FILE_MAX]; + BLI_strncpy(filepath_cstr, filepath_, FILE_MAX); - UTF16_ENCODE(filename_cstr); - std::wstring wstr(filename_cstr_16); + UTF16_ENCODE(filepath_cstr); + std::wstring wstr(filepath_cstr_16); result = main_doc_.save_file(wstr.c_str()); - UTF16_UN_ENCODE(filename_cstr); + UTF16_UN_ENCODE(filepath_cstr); #else - result = main_doc_.save_file(filename_); + result = main_doc_.save_file(filepath_); #endif return result; diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.hh b/source/blender/io/gpencil/intern/gpencil_io_export_svg.hh index 2e1cc231e68..7bbc2710693 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.hh +++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.hh @@ -20,7 +20,7 @@ namespace blender::io::gpencil { class GpencilExporterSVG : public GpencilExporter { public: - GpencilExporterSVG(const char *filename, const struct GpencilIOParams *iparams); + GpencilExporterSVG(const char *filepath, const struct GpencilIOParams *iparams); bool add_newpage(); bool add_body(); bool write(); diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc index bad5c7d6401..06460a1beba 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc @@ -33,17 +33,17 @@ using blender::MutableSpan; namespace blender::io::gpencil { /* Constructor. */ -GpencilImporterSVG::GpencilImporterSVG(const char *filename, const GpencilIOParams *iparams) +GpencilImporterSVG::GpencilImporterSVG(const char *filepath, const GpencilIOParams *iparams) : GpencilImporter(iparams) { - filename_set(filename); + filepath_set(filepath); } bool GpencilImporterSVG::read() { bool result = true; NSVGimage *svg_data = nullptr; - svg_data = nsvgParseFromFile(filename_, "mm", 96.0f); + svg_data = nsvgParseFromFile(filepath_, "mm", 96.0f); if (svg_data == nullptr) { std::cout << " Could not open SVG.\n "; return false; diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh b/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh index f1f4e9a6290..d868e672567 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh +++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh @@ -21,7 +21,7 @@ namespace blender::io::gpencil { class GpencilImporterSVG : public GpencilImporter { public: - GpencilImporterSVG(const char *filename, const struct GpencilIOParams *iparams); + GpencilImporterSVG(const char *filepath, const struct GpencilIOParams *iparams); bool read(); -- cgit v1.2.3