diff options
| author | Matthias Melcher <github@matthiasm.com> | 2026-01-05 12:54:12 +0100 |
|---|---|---|
| committer | Matthias Melcher <github@matthiasm.com> | 2026-01-05 21:06:04 +0100 |
| commit | 89aa5726f8d772e0fec1ebcbdfa3b74aa7a217f8 (patch) | |
| tree | 2bb2c31e1b283d33a1bff29aa3a105362f2a9435 /fluid/io | |
| parent | 5f10939cfa0fc943dfc28b441efa9e9028eef5e5 (diff) | |
Fluid: Improve std::string output
Fluid: Update Widget_Node to std::string
Fluid: Image names to std::string
Fluid: std::string tooltip
Fluid: stringify Widget_Node::subtype
Fluid:: extra_code
Diffstat (limited to 'fluid/io')
| -rw-r--r-- | fluid/io/Project_Writer.cxx | 6 | ||||
| -rw-r--r-- | fluid/io/Project_Writer.h | 3 | ||||
| -rw-r--r-- | fluid/io/String_Writer.cxx | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/fluid/io/Project_Writer.cxx b/fluid/io/Project_Writer.cxx index 387c0093f..54af531e9 100644 --- a/fluid/io/Project_Writer.cxx +++ b/fluid/io/Project_Writer.cxx @@ -119,9 +119,9 @@ int Project_Writer::write_project(const char *filename, int selected_only, bool proj_.i18n.write(*this); if (!selected_only) { - write_string("\nheader_name"); write_word(proj_.header_file_name.c_str()); - write_string("\ncode_name"); write_word(proj_.code_file_name.c_str()); - write_string("\ninclude_guard"); write_word(proj_.include_guard.c_str()); + write_string("\nheader_name"); write_word(proj_.header_file_name); + write_string("\ncode_name"); write_word(proj_.code_file_name); + write_string("\ninclude_guard"); write_word(proj_.include_guard); Fluid.layout_list.write(this); if (g_shell_config) g_shell_config->write(this); diff --git a/fluid/io/Project_Writer.h b/fluid/io/Project_Writer.h index 4b21cf2fb..c95c9f7cb 100644 --- a/fluid/io/Project_Writer.h +++ b/fluid/io/Project_Writer.h @@ -21,6 +21,8 @@ #include <stdio.h> +#include <string> + class Node; namespace fld { @@ -52,6 +54,7 @@ public: int write_project(const char *filename, int selected_only, bool codeview); void NewFunction(); void write_word(const char *); + void write_word(const std::string& word) { write_word(word.c_str()); } void write_string(const char *,...) __fl_attr((__format__ (__printf__, 2, 3))); void write_indent(int n); void write_open(); diff --git a/fluid/io/String_Writer.cxx b/fluid/io/String_Writer.cxx index e96d2068e..4928e218a 100644 --- a/fluid/io/String_Writer.cxx +++ b/fluid/io/String_Writer.cxx @@ -77,8 +77,8 @@ int fld::io::write_strings(Project &proj, const std::string &filename) { write_escaped_strings(fp, w->label()); putc('\n', fp); } - if (w->tooltip()) { - write_escaped_strings(fp, w->tooltip()); + if (!w->tooltip().empty()) { + write_escaped_strings(fp, w->tooltip().c_str()); putc('\n', fp); } } @@ -100,13 +100,13 @@ int fld::io::write_strings(Project &proj, const std::string &filename) { fputs("\"\n", fp); } - if (w->tooltip()) { + if (!w->tooltip().empty()) { fputs("msgid \"", fp); - write_escaped_strings(fp, w->tooltip()); + write_escaped_strings(fp, w->tooltip().c_str()); fputs("\"\n", fp); fputs("msgstr \"", fp); - write_escaped_strings(fp, w->tooltip()); + write_escaped_strings(fp, w->tooltip().c_str()); fputs("\"\n", fp); } } @@ -128,9 +128,9 @@ int fld::io::write_strings(Project &proj, const std::string &filename) { fputs("\"\n", fp); } - if (w->tooltip()) { + if (!w->tooltip().empty()) { fprintf(fp, "%d \"", i ++); - write_escaped_strings(fp, w->tooltip()); + write_escaped_strings(fp, w->tooltip().c_str()); fputs("\"\n", fp); } } |