Replce Fl_String in Fluid with std::string.

Also fix for Linux.

1 files changed, 24 insertions, 24 deletions

diff --git a/fluid/fluid.h b/fluid/fluid.h
index 7ed488a4a..e8730efb2 100644
--- a/fluid/fluid.h
+++ b/fluid/fluid.h
@@ -90,11 +90,11 @@ extern int batch_mode;
 
 extern int pasteoffset;
 
-extern Fl_String g_code_filename_arg;
-extern Fl_String g_header_filename_arg;
-extern Fl_String g_launch_path;
+extern std::string g_code_filename_arg;
+extern std::string g_header_filename_arg;
+extern std::string g_launch_path;
 
-extern Fl_String g_autodoc_path;
+extern std::string g_autodoc_path;
 
 // ---- project class declaration
 
@@ -117,39 +117,39 @@ public:
   void reset();
   void update_settings_dialog();
 
-  Fl_String projectfile_path() const;
-  Fl_String projectfile_name() const;
-  Fl_String codefile_path() const;
-  Fl_String codefile_name() const;
-  Fl_String headerfile_path() const;
-  Fl_String headerfile_name() const;
-  Fl_String stringsfile_path() const;
-  Fl_String stringsfile_name() const;
-  Fl_String basename() const;
+  std::string projectfile_path() const;
+  std::string projectfile_name() const;
+  std::string codefile_path() const;
+  std::string codefile_name() const;
+  std::string headerfile_path() const;
+  std::string headerfile_name() const;
+  std::string stringsfile_path() const;
+  std::string stringsfile_name() const;
+  std::string basename() const;
 
   /// One of the available internationalization types.
   Fd_I18n_Type i18n_type;
   /// Include file for GNU i18n, writes an #include statement into the source
   /// file. This is usually `<libintl.h>` or `"gettext.h"` for GNU gettext.
-  Fl_String i18n_gnu_include;
+  std::string i18n_gnu_include;
   // Optional name of a macro for conditional i18n compilation.
-  Fl_String i18n_gnu_conditional;
+  std::string i18n_gnu_conditional;
   /// For the gettext/intl.h options, this is the function that translates text
   /// at runtime. This is usually "gettext" or "_".
-  Fl_String i18n_gnu_function;
+  std::string i18n_gnu_function;
   /// For the gettext/intl.h options, this is the function that marks the translation
   /// of text at initialisation time. This is usually "gettext_noop" or "N_".
-  Fl_String i18n_gnu_static_function;
+  std::string i18n_gnu_static_function;
 
   /// Include file for Posix i18n, write a #include statement into the source
   /// file. This is usually `<nl_types.h>` for Posix catgets.
-  Fl_String i18n_pos_include;
+  std::string i18n_pos_include;
   // Optional name of a macro for conditional i18n compilation.
-  Fl_String i18n_pos_conditional;
+  std::string i18n_pos_conditional;
   /// Name of the nl_catd database
-  Fl_String i18n_pos_file;
+  std::string i18n_pos_file;
   /// Message set ID for the catalog.
-  Fl_String i18n_pos_set;
+  std::string i18n_pos_set;
 
   /// If set, generate code to include the header file form the c++ file
   int include_H_from_C;
@@ -165,9 +165,9 @@ public:
   int code_file_set;
   int write_mergeback_data;
   /// Hold the default extension for header files, or the entire filename if set via command line.
-  Fl_String header_file_name;
+  std::string header_file_name;
   /// Hold the default extension for source code  files, or the entire filename if set via command line.
-  Fl_String code_file_name;
+  std::string code_file_name;
 };
 
 extern Fluid_Project g_project;
@@ -180,7 +180,7 @@ extern void leave_project_dir();
 extern void set_filename(const char *c);
 extern void set_modflag(int mf, int mfc=-1);
 
-extern const Fl_String &get_tmpdir();
+extern const std::string &get_tmpdir();
 
 // ---- public callback functions