diff options
| author | Matthias Melcher <github@matthiasm.com> | 2025-03-07 20:26:03 +0100 |
|---|---|---|
| committer | Matthias Melcher <github@matthiasm.com> | 2025-03-07 20:26:03 +0100 |
| commit | 1186b4e255832ae322e4dd2778318ebcb4568204 (patch) | |
| tree | 34ec0d5edde3c1f1c5c51f0f5083b7f5d85c708b /fluid/panels | |
| parent | 70e5dc23aee51fc2fe67c73390d808e01ccfbfa6 (diff) | |
Making fl_filename_... public for std::string.
New functions append "_str" to the function name to
avoid ambiguities when calling them. So
'char *fl_filename_name(const char *)' becomes
'std::string fl_filename_name_str(const std::string &)'
Diffstat (limited to 'fluid/panels')
| -rw-r--r-- | fluid/panels/settings_panel.cxx | 4 | ||||
| -rw-r--r-- | fluid/panels/settings_panel.fl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx index fd67676c6..fb31a319d 100644 --- a/fluid/panels/settings_panel.cxx +++ b/fluid/panels/settings_panel.cxx @@ -600,8 +600,8 @@ static void cb_w_layout_menu_save(Fl_Menu_*, void*) { fnfc.options(Fl_Native_File_Chooser::SAVEAS_CONFIRM | Fl_Native_File_Chooser::USE_FILTER_EXT); fnfc.filter("FLUID Layouts\t*.fll\n"); std::string filename = g_layout_list.filename_; - fnfc.directory(fl_filename_path(filename).c_str()); - fnfc.preset_file(fl_filename_name(filename).c_str()); + fnfc.directory(fl_filename_path_str(filename).c_str()); + fnfc.preset_file(fl_filename_name_str(filename).c_str()); if (fnfc.show() != 0) return; const char *new_filename = fnfc.filename(); if (!new_filename) return; diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl index fad6580af..7890e5b83 100644 --- a/fluid/panels/settings_panel.fl +++ b/fluid/panels/settings_panel.fl @@ -574,8 +574,8 @@ g_layout_list.update_dialogs();} fnfc.options(Fl_Native_File_Chooser::SAVEAS_CONFIRM | Fl_Native_File_Chooser::USE_FILTER_EXT); fnfc.filter("FLUID Layouts\\t*.fll\\n"); std::string filename = g_layout_list.filename_; - fnfc.directory(fl_filename_path(filename).c_str()); - fnfc.preset_file(fl_filename_name(filename).c_str()); + fnfc.directory(fl_filename_path_str(filename).c_str()); + fnfc.preset_file(fl_filename_name_str(filename).c_str()); if (fnfc.show() != 0) return; const char *new_filename = fnfc.filename(); if (!new_filename) return; |