Fluid: last incremental chage, restructuring

1 files changed, 12 insertions, 6 deletions

diff --git a/fluid/io/Code_Writer.h b/fluid/io/Code_Writer.h
index 758e7bf45..b4a6518b4 100644
--- a/fluid/io/Code_Writer.h
+++ b/fluid/io/Code_Writer.h
@@ -14,8 +14,8 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#ifndef _FLUID_CODE_H
-#define _FLUID_CODE_H
+#ifndef FLUID_IO_CODE_WRITER_H
+#define FLUID_IO_CODE_WRITER_H
 
 #include <FL/fl_attr.h>
 
@@ -31,7 +31,10 @@ struct Fd_Pointer_Tree;
 int is_id(char c);
 int write_strings(const std::string &filename);
 
-class Fd_Code_Writer
+namespace fld {
+namespace io {
+
+class Code_Writer
 {
 protected:
   /// file pointer for the C++ code file
@@ -77,8 +80,8 @@ public:
   int varused;
 
 public:
-  Fd_Code_Writer();
-  ~Fd_Code_Writer();
+  Code_Writer();
+  ~Code_Writer();
   const char* unique_id(void* o, const char*, const char*, const char*);
   /// Increment source code indentation level.
   void indent_more() { indentation++; }
@@ -109,4 +112,7 @@ public:
   static unsigned long block_crc(const void *data, int n=-1, unsigned long in_crc=0, bool *inout_line_start=NULL);
 };
 
-#endif // _FLUID_CODE_H
+} // namespace io
+} // namespace fld
+
+#endif // FLUID_IO_CODE_WRITER_H