Fluid: last incremental chage, restructuring

1 files changed, 9 insertions, 9 deletions

diff --git a/fluid/app/Fluid_Image.h b/fluid/app/Fluid_Image.h
index e3b5faaac..f095e83ce 100644
--- a/fluid/app/Fluid_Image.h
+++ b/fluid/app/Fluid_Image.h
@@ -21,7 +21,7 @@
 #ifndef FLUID_IMAGE_H
 #define FLUID_IMAGE_H
 
-#include "io/code.h"
+#include "io/Code_Writer.h"
 
 #include <FL/Fl_Shared_Image.H>
 
@@ -34,9 +34,9 @@ class Fluid_Image {
 protected:
   Fluid_Image(const char *name); // no public constructor
   ~Fluid_Image(); // no public destructor
-  size_t write_static_binary(Fd_Code_Writer& f, const char* fmt);
-  size_t write_static_text(Fd_Code_Writer& f, const char* fmt);
-  void write_static_rgb(Fd_Code_Writer& f, const char* idata_name);
+  size_t write_static_binary(fld::io::Code_Writer& f, const char* fmt);
+  size_t write_static_text(fld::io::Code_Writer& f, const char* fmt);
+  void write_static_rgb(fld::io::Code_Writer& f, const char* idata_name);
 public:
   int written;
   static Fluid_Image* find(const char *);
@@ -44,11 +44,11 @@ public:
   void increment();
   void image(Fl_Widget *); // set the image of this widget
   void deimage(Fl_Widget *); // set the deimage of this widget
-  void write_static(Fd_Code_Writer& f, int compressed);
-  void write_initializer(Fd_Code_Writer& f, const char *type_name, const char *format, ...);
-  void write_code(Fd_Code_Writer& f, int bind, const char *var, int inactive = 0);
-  void write_inline(Fd_Code_Writer& f, int inactive = 0);
-  void write_file_error(Fd_Code_Writer& f, const char *fmt);
+  void write_static(fld::io::Code_Writer& f, int compressed);
+  void write_initializer(fld::io::Code_Writer& f, const char *type_name, const char *format, ...);
+  void write_code(fld::io::Code_Writer& f, int bind, const char *var, int inactive = 0);
+  void write_inline(fld::io::Code_Writer& f, int inactive = 0);
+  void write_file_error(fld::io::Code_Writer& f, const char *fmt);
   const char *name() const {return name_;}
 };