Rename all remaining functions that don't start with fl_ to

fl_foo. (filename_xyz becomes fl_filename_xyz, down becomes
fl_down, define_FL_PLASTIC_BOX becomes fl_define_FL_PLASTIC_BOX,
etc.)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2026 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 28 insertions, 28 deletions

diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx
index 41f847459..cd0dfa774 100644
--- a/fluid/Fluid_Image.cxx
+++ b/fluid/Fluid_Image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.7 2002/01/06 17:51:12 easysw Exp $"
+// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.8 2002/03/25 21:08:41 easysw Exp $"
 //
 // Pixmap label support for the Fast Light Tool Kit (FLTK).
 //
@@ -59,7 +59,7 @@ void Fluid_Image::write_static() {
       pixmap_header_written = write_number;
     }
     write_c("static const char *%s[] = {\n",
-	    unique_id(this, "idata", filename_name(name()), 0));
+	    unique_id(this, "idata", fl_filename_name(name()), 0));
     write_cstring(img->data()[0], strlen(img->data()[0]));
 
     int i;
@@ -82,8 +82,8 @@ void Fluid_Image::write_static() {
     }
     write_c("\n};\n");
     write_c("static Fl_Pixmap %s(%s);\n",
-	    unique_id(this, "image", filename_name(name()), 0),
-	    unique_id(this, "idata", filename_name(name()), 0));
+	    unique_id(this, "image", fl_filename_name(name()), 0),
+	    unique_id(this, "idata", fl_filename_name(name()), 0));
   } else if (img->d() == 0) {
     // Write Bitmap data...
     write_c("\n");
@@ -92,12 +92,12 @@ void Fluid_Image::write_static() {
       bitmap_header_written = write_number;
     }
     write_c("static unsigned char %s[] =\n",
-	    unique_id(this, "idata", filename_name(name()), 0));
+	    unique_id(this, "idata", fl_filename_name(name()), 0));
     write_cstring(img->data()[0], ((img->w() + 7) / 8) * img->h());
     write_c(";\n");
     write_c("static Fl_Bitmap %s(%s, %d, %d);\n",
-	    unique_id(this, "image", filename_name(name()), 0),
-	    unique_id(this, "idata", filename_name(name()), 0),
+	    unique_id(this, "image", fl_filename_name(name()), 0),
+	    unique_id(this, "idata", fl_filename_name(name()), 0),
 	    img->w(), img->h());
   } else {
     // Write image data...
@@ -107,12 +107,12 @@ void Fluid_Image::write_static() {
       image_header_written = write_number;
     }
     write_c("static unsigned char %s[] =\n",
-	    unique_id(this, "idata", filename_name(name()), 0));
+	    unique_id(this, "idata", fl_filename_name(name()), 0));
     write_cstring(img->data()[0], (img->w() * img->d() + img->ld()) * img->h());
     write_c(";\n");
     write_c("static Fl_RGB_Image %s(%s, %d, %d, %d, %d);\n",
-	    unique_id(this, "image", filename_name(name()), 0),
-	    unique_id(this, "idata", filename_name(name()), 0),
+	    unique_id(this, "image", fl_filename_name(name()), 0),
+	    unique_id(this, "idata", fl_filename_name(name()), 0),
 	    img->w(), img->h(), img->d(), img->ld());
   }
 }
@@ -120,7 +120,7 @@ void Fluid_Image::write_static() {
 void Fluid_Image::write_code(int inactive) {
   if (!img) return;
   write_c("%so->%s(%s);\n", indent(), inactive ? "deimage" : "image",
-	  unique_id(this, "image", filename_name(name()), 0));
+	  unique_id(this, "image", fl_filename_name(name()), 0));
 }
 
 
@@ -220,5 +220,5 @@ Fluid_Image *ui_find_image(const char *oldname) {
 
 
 //
-// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.7 2002/01/06 17:51:12 easysw Exp $".
+// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.8 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/fluid/code.cxx b/fluid/code.cxx
index a76c8667d..1e15abd71 100644
--- a/fluid/code.cxx
+++ b/fluid/code.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: code.cxx,v 1.9.2.9.2.3 2002/01/01 15:11:29 easysw Exp $"
+// "$Id: code.cxx,v 1.9.2.9.2.4 2002/03/25 21:08:41 easysw Exp $"
 //
 // Code output routines for the Fast Light Tool Kit (FLTK).
 //
@@ -278,7 +278,7 @@ int write_code(const char *s, const char *t) {
   fprintf(code_file, hdr, FL_VERSION);
 
   {char define_name[102];
-  const char* a = filename_name(t);
+  const char* a = fl_filename_name(t);
   char* b = define_name;
   if (!isalpha(*a)) {*b++ = '_';}
   while (*a) {*b++ = isalnum(*a) ? *a : '_'; a++;}
@@ -307,7 +307,7 @@ int write_code(const char *s, const char *t) {
   }
   if (t && include_H_from_C) {
     if (*header_file_name == '.' && strchr(header_file_name, '/') == NULL) {
-      write_c("#include \"%s\"\n", filename_name(t));
+      write_c("#include \"%s\"\n", fl_filename_name(t));
     } else {
       write_c("#include \"%s\"\n", t);
     }
@@ -464,5 +464,5 @@ void Fl_Type::write_code1() {
 void Fl_Type::write_code2() {}
 
 //
-// End of "$Id: code.cxx,v 1.9.2.9.2.3 2002/01/01 15:11:29 easysw Exp $".
+// End of "$Id: code.cxx,v 1.9.2.9.2.4 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 6388d316f..38bb0f6aa 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fluid.cxx,v 1.15.2.13.2.11 2002/01/01 15:11:29 easysw Exp $"
+// "$Id: fluid.cxx,v 1.15.2.13.2.12 2002/03/25 21:08:41 easysw Exp $"
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
@@ -82,7 +82,7 @@ static char in_source_dir;
 void goto_source_dir() {
   if (in_source_dir) return;
   if (!filename || !*filename) return;
-  const char *p = filename_name(filename);
+  const char *p = fl_filename_name(filename);
   if (p <= filename) return; // it is in the current directory
   char buffer[1024];
   strcpy(buffer,filename);
@@ -178,17 +178,17 @@ void write_cb(Fl_Widget *, void *) {
   }
   char cname[1024];
   char hname[1024];
-  strcpy(i18n_program, filename_name(filename));
-  filename_setext(i18n_program, "");
+  strcpy(i18n_program, fl_filename_name(filename));
+  fl_filename_setext(i18n_program, "");
   if (*code_file_name == '.' && strchr(code_file_name, '/') == NULL) {
-    strcpy(cname,filename_name(filename));
-    filename_setext(cname, code_file_name);
+    strcpy(cname,fl_filename_name(filename));
+    fl_filename_setext(cname, code_file_name);
   } else {
     strcpy(cname, code_file_name);
   }
   if (*header_file_name == '.' && strchr(header_file_name, '/') == NULL) {
-    strcpy(hname,filename_name(filename));
-    filename_setext(hname, header_file_name);
+    strcpy(hname,fl_filename_name(filename));
+    fl_filename_setext(hname, header_file_name);
   } else {
     strcpy(hname, header_file_name);
   }
@@ -214,8 +214,8 @@ void write_strings_cb(Fl_Widget *, void *) {
     if (!filename) return;
   }
   char sname[1024];
-  strcpy(sname,filename_name(filename));
-  filename_setext(sname, exts[i18n_type]);
+  strcpy(sname,fl_filename_name(filename));
+  fl_filename_setext(sname, exts[i18n_type]);
   if (!compile_only) goto_source_dir();
   int x = write_strings(sname);
   if (!compile_only) leave_source_dir();
@@ -267,7 +267,7 @@ static char* cutfname() {
 #else
   static char name[256] = "~/.fluid_cut_buffer";
   static char beenhere;
-  if (!beenhere) {beenhere = 1; filename_expand(name,name);}
+  if (!beenhere) {beenhere = 1; fl_filename_expand(name,name);}
   return name;
 #endif
 }
@@ -511,5 +511,5 @@ int main(int argc,char **argv) {
 }
 
 //
-// End of "$Id: fluid.cxx,v 1.15.2.13.2.11 2002/01/01 15:11:29 easysw Exp $".
+// End of "$Id: fluid.cxx,v 1.15.2.13.2.12 2002/03/25 21:08:41 easysw Exp $".
 //