Fluid: last incremental chage, restructuring

1 files changed, 13 insertions, 48 deletions

diff --git a/fluid/io/Project_Writer.h b/fluid/io/Project_Writer.h
index 470cc1a7b..c6e50ca7c 100644
--- a/fluid/io/Project_Writer.h
+++ b/fluid/io/Project_Writer.h
@@ -14,59 +14,21 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#ifndef _FLUID_FILE_H
-#define _FLUID_FILE_H
-
-#include "nodes/Fl_Type.h"
+#ifndef FLUID_IO_PROJECT_WRITER_H
+#define FLUID_IO_PROJECT_WRITER_H
 
 #include <FL/fl_attr.h>
 
+#include <stdio.h>
+
 class Fl_Type;
 
-extern int fdesign_flip;
+namespace fld {
+namespace io {
 
-int read_file(const char *, int merge, Strategy strategy=Strategy::FROM_FILE_AS_LAST_CHILD);
 int write_file(const char *, int selected_only = 0, bool to_codeview = false);
 
-class Fd_Project_Reader
-{
-protected:
-  /// Project input file
-  FILE *fin;
-  /// Number of most recently read line
-  int lineno;
-  /// Pointer to the file path and name (not copied!)
-  const char *fname;
-  /// Expanding buffer to store the most recently read word
-  char *buffer;
-  /// Exact size of the expanding buffer in bytes
-  int buflen;
-
-  void expand_buffer(int length);
-
-  int nextchar() { for (;;) { int ret = fgetc(fin); if (ret!='\r') return ret; } }
-
-public:
-  /// Holds the file version number after reading the "version" tag
-  double read_version;
-
-public:
-  Fd_Project_Reader();
-  ~Fd_Project_Reader();
-  int open_read(const char *s);
-  int close_read();
-  const char *filename_name();
-  int read_quoted();
-  Fl_Type *read_children(Fl_Type *p, int merge, Strategy strategy, char skip_options=0);
-  int read_project(const char *, int merge, Strategy strategy=Strategy::FROM_FILE_AS_LAST_CHILD);
-  void read_error(const char *format, ...);
-  const char *read_word(int wantbrace = 0);
-  int read_int();
-  int read_fdesign_line(const char*& name, const char*& value);
-  void read_fdesign();
-};
-
-class Fd_Project_Writer
+class Project_Writer
 {
 protected:
   // Project output file, always opened in "wb" mode
@@ -77,8 +39,8 @@ protected:
   bool write_codeview_;
 
 public:
-  Fd_Project_Writer();
-  ~Fd_Project_Writer();
+  Project_Writer();
+  ~Project_Writer();
   int open_write(const char *s);
   int close_write();
   int write_project(const char *filename, int selected_only, bool codeview);
@@ -91,4 +53,7 @@ public:
   bool write_codeview() const { return write_codeview_; }
 };
 
-#endif // _FLUID_FILE_H
+} // namespace io
+} // namespace fld
+
+#endif // FLUID_IO_PROJECT_WRITER_H