Fluid: last incremental chage, restructuring

1 files changed, 5 insertions, 80 deletions

diff --git a/fluid/app/fluid.h b/fluid/app/fluid.h
index 9b4394637..686047a72 100644
--- a/fluid/app/fluid.h
+++ b/fluid/app/fluid.h
@@ -14,10 +14,10 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#ifndef _FLUID_FLUID_H
-#define _FLUID_FLUID_H
+#ifndef FLUID_APP_FLUID_H
+#define FLUID_APP_FLUID_H
 
-#include "tools/fluid_filename.h"
+#include "tools/filename.h"
 
 #include <FL/Fl_Preferences.H>
 #include <FL/Fl_Menu_Item.H>
@@ -99,82 +99,6 @@ extern std::string g_launch_path;
 
 extern std::string g_autodoc_path;
 
-// ---- project class declaration
-
-/**
- Enumeration of available internationalization types.
- */
-typedef enum {
-  FD_I18N_NONE = 0, ///< No i18n, all strings are litearals
-  FD_I18N_GNU,      ///< GNU gettext internationalization
-  FD_I18N_POSIX     ///< Posix catgets internationalization
-} Fd_I18n_Type;
-
-/**
- Data and settings for a FLUID project file.
- */
-class Fluid_Project {
-public:
-  Fluid_Project();
-  ~Fluid_Project();
-  void reset();
-  void update_settings_dialog();
-
-  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.
-  std::string i18n_gnu_include;
-  // Optional name of a macro for conditional i18n compilation.
-  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 "_".
-  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_".
-  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.
-  std::string i18n_pos_include;
-  // Optional name of a macro for conditional i18n compilation.
-  std::string i18n_pos_conditional;
-  /// Name of the nl_catd database
-  std::string i18n_pos_file;
-  /// Message set ID for the catalog.
-  std::string i18n_pos_set;
-
-  /// If set, generate code to include the header file form the c++ file
-  int include_H_from_C;
-  /// If set, handle keyboard shortcut Ctrl on macOS using Cmd instead
-  int use_FL_COMMAND;
-  /// Clear if UTF-8 characters in statics texts are written as escape sequences
-  int utf8_in_src;
-  /// If set, <FL/Fl.H> will not be included from the header code before anything else
-  int avoid_early_includes;
-  /// If set, command line overrides header file name in .fl file.
-  int header_file_set;
-  ///  If set, command line overrides source code file name in .fl file.
-  int code_file_set;
-  int write_mergeback_data;
-  /// Hold the default extension for header files, or the entire filename if set via command line.
-  std::string header_file_name;
-  /// Hold the default extension for source code  files, or the entire filename if set via command line.
-  std::string code_file_name;
-};
-
-extern Fluid_Project g_project;
-
 // ---- public functions
 
 extern int fluid_main(int argc,char **argv);
@@ -186,6 +110,7 @@ extern void set_filename(const char *c);
 extern void set_modflag(int mf, int mfc=-1);
 
 extern const std::string &get_tmpdir();
+extern std::string end_with_slash(const std::string &str);
 
 // ---- public callback functions
 
@@ -205,5 +130,5 @@ inline int fd_min(int a, int b) { return (a < b ? a : b); }
 inline int fd_max(int a, int b) { return (a > b ? a : b); }
 inline int fd_min(int a, int b, int c) { return fd_min(a, fd_min(b, c)); }
 
-#endif // _FLUID_FLUID_H
+#endif // FLUID_APP_FLUID_H