Rename FL/fl_string.h to FL/fl_string_functions.h

This is part 1 of the final fix for a previous name clash on case
insensitive file systems (fl_string.h vs. Fl_String.H).

13 files changed, 20 insertions, 20 deletions

diff --git a/fluid/ExternalCodeEditor_UNIX.cxx b/fluid/ExternalCodeEditor_UNIX.cxx
index 8ff27d036..e7c79d9f0 100644
--- a/fluid/ExternalCodeEditor_UNIX.cxx
+++ b/fluid/ExternalCodeEditor_UNIX.cxx
@@ -9,7 +9,7 @@
 
 #include <FL/Fl.H>      /* Fl_Timeout_Handler.. */
 #include <FL/fl_ask.H>  /* fl_alert() */
-#include <FL/fl_string.h> /* fl_strdup() */
+#include <FL/fl_string_functions.h> /* fl_strdup() */
 
 #include <errno.h>      /* errno */
 #include <string.h>     /* strerror() */
diff --git a/fluid/ExternalCodeEditor_WIN32.cxx b/fluid/ExternalCodeEditor_WIN32.cxx
index a137b3e6f..5536947cf 100644
--- a/fluid/ExternalCodeEditor_WIN32.cxx
+++ b/fluid/ExternalCodeEditor_WIN32.cxx
@@ -19,7 +19,7 @@
 #include <FL/Fl.H>      // Fl_Timeout_Handler..
 #include <FL/fl_ask.H>  // fl_alert()
 #include <FL/fl_utf8.h> // fl_utf8fromwc()
-#include <FL/fl_string.h> // fl_strdup()
+#include <FL/fl_string_functions.h> // fl_strdup()
 
 #include "ExternalCodeEditor_WIN32.h"
 
diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index a4ab673a0..3c728863e 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/fluid/Fl_Function_Type.cxx
@@ -25,7 +25,7 @@
 #include "function_panel.h"
 #include "comments.h"
 
-#include <FL/fl_string.h>
+#include <FL/fl_string_functions.h>
 #include <FL/Fl_File_Chooser.H>
 #include <FL/fl_ask.H>
 #include "../src/flstring.h"
diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx
index a63355a32..58f5b8dfb 100644
--- a/fluid/Fluid_Image.cxx
+++ b/fluid/Fluid_Image.cxx
@@ -26,7 +26,7 @@
 #include <FL/Fl_Widget.H>
 #include <FL/Fl_Window.H>
 #include <FL/filename.H>
-#include <FL/fl_string.h>
+#include <FL/fl_string_functions.h>
 #include <FL/fl_utf8.h>     // fl_fopen()
 #include <FL/Fl_File_Chooser.H>
 #include "../src/flstring.h"
diff --git a/fluid/code.cxx b/fluid/code.cxx
index 7de06ea00..ba57ae8b8 100644
--- a/fluid/code.cxx
+++ b/fluid/code.cxx
@@ -23,7 +23,7 @@
 #include "file.h"
 
 #include <FL/Fl.H>
-#include <FL/fl_string.h>
+#include <FL/fl_string_functions.h>
 #include <FL/filename.H>
 #include "../src/flstring.h"
 
diff --git a/fluid/file.cxx b/fluid/file.cxx
index 0e6fbe4d2..39768ea2e 100644
--- a/fluid/file.cxx
+++ b/fluid/file.cxx
@@ -33,7 +33,7 @@
 
 #include <FL/Fl.H>
 #include <FL/Fl_Group.H>
-#include <FL/fl_string.h>
+#include <FL/fl_string_functions.h>
 #include <FL/fl_message.H>
 #include "../src/flstring.h"
 
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 95568d63f..1ed1ad93b 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -42,7 +42,7 @@
 #include <FL/Fl_PNG_Image.H>
 #include <FL/Fl_Native_File_Chooser.H>
 #include <FL/Fl_Printer.H>
-#include <FL/fl_string.h>
+#include <FL/fl_string_functions.h>
 #include <locale.h>     // setlocale()..
 #include "../src/flstring.h"
 
diff --git a/fluid/makedepend b/fluid/makedepend
index d9f4a0dd7..ad6d1850d 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -151,7 +151,7 @@ code.o: ../FL/Fl_Shared_Image.H
 code.o: ../FL/Fl_Simple_Terminal.H
 code.o: ../FL/Fl_Slider.H
 code.o: ../FL/Fl_Spinner.H
-code.o: ../FL/fl_string.h
+code.o: ../FL/fl_string_functions.h
 code.o: ../FL/Fl_Tabs.H
 code.o: ../FL/Fl_Text_Buffer.H
 code.o: ../FL/Fl_Text_Display.H
@@ -217,8 +217,8 @@ ExternalCodeEditor_UNIX.o: ../FL/fl_config.h
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Export.H
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Menu_Item.H
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Preferences.H
-ExternalCodeEditor_UNIX.o: ../FL/fl_string.h
 ExternalCodeEditor_UNIX.o: ../FL/Fl_String_class.H
+ExternalCodeEditor_UNIX.o: ../FL/fl_string_functions.h
 ExternalCodeEditor_UNIX.o: ../FL/fl_types.h
 ExternalCodeEditor_UNIX.o: ../FL/fl_utf8.h
 ExternalCodeEditor_UNIX.o: ../FL/platform_types.h
@@ -339,8 +339,8 @@ file.o: ../FL/Fl_Shared_Image.H
 file.o: ../FL/Fl_Simple_Terminal.H
 file.o: ../FL/Fl_Slider.H
 file.o: ../FL/Fl_Spinner.H
-file.o: ../FL/fl_string.h
 file.o: ../FL/Fl_String_class.H
+file.o: ../FL/fl_string_functions.h
 file.o: ../FL/Fl_Tabs.H
 file.o: ../FL/Fl_Text_Buffer.H
 file.o: ../FL/Fl_Text_Display.H
@@ -421,8 +421,8 @@ fluid.o: ../FL/Fl_Shared_Image.H
 fluid.o: ../FL/Fl_Simple_Terminal.H
 fluid.o: ../FL/Fl_Slider.H
 fluid.o: ../FL/Fl_Spinner.H
-fluid.o: ../FL/fl_string.h
 fluid.o: ../FL/Fl_String_class.H
+fluid.o: ../FL/fl_string_functions.h
 fluid.o: ../FL/Fl_Tabs.H
 fluid.o: ../FL/Fl_Text_Buffer.H
 fluid.o: ../FL/Fl_Text_Display.H
@@ -500,8 +500,8 @@ Fluid_Image.o: ../FL/Fl_Rect.H
 Fluid_Image.o: ../FL/Fl_Return_Button.H
 Fluid_Image.o: ../FL/Fl_RGB_Image.H
 Fluid_Image.o: ../FL/Fl_Shared_Image.H
-Fluid_Image.o: ../FL/fl_string.h
 Fluid_Image.o: ../FL/Fl_String_class.H
+Fluid_Image.o: ../FL/fl_string_functions.h
 Fluid_Image.o: ../FL/Fl_Tabs.H
 Fluid_Image.o: ../FL/Fl_Tile.H
 Fluid_Image.o: ../FL/fl_types.h
@@ -563,8 +563,8 @@ Fl_Function_Type.o: ../FL/Fl_RGB_Image.H
 Fl_Function_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Function_Type.o: ../FL/Fl_Shared_Image.H
 Fl_Function_Type.o: ../FL/Fl_Slider.H
-Fl_Function_Type.o: ../FL/fl_string.h
 Fl_Function_Type.o: ../FL/Fl_String_class.H
+Fl_Function_Type.o: ../FL/fl_string_functions.h
 Fl_Function_Type.o: ../FL/Fl_Tabs.H
 Fl_Function_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Function_Type.o: ../FL/Fl_Text_Display.H
@@ -1071,8 +1071,8 @@ shell_command.o: ../FL/Fl_Scrollbar.H
 shell_command.o: ../FL/Fl_Simple_Terminal.H
 shell_command.o: ../FL/Fl_Slider.H
 shell_command.o: ../FL/Fl_Spinner.H
-shell_command.o: ../FL/fl_string.h
 shell_command.o: ../FL/Fl_String_class.H
+shell_command.o: ../FL/fl_string_functions.h
 shell_command.o: ../FL/Fl_Tabs.H
 shell_command.o: ../FL/Fl_Text_Buffer.H
 shell_command.o: ../FL/Fl_Text_Display.H
@@ -1169,8 +1169,8 @@ template_panel.o: ../FL/Fl_Menu_Item.H
 template_panel.o: ../FL/Fl_Preferences.H
 template_panel.o: ../FL/Fl_Return_Button.H
 template_panel.o: ../FL/Fl_Shared_Image.H
-template_panel.o: ../FL/fl_string.h
 template_panel.o: ../FL/Fl_String_class.H
+template_panel.o: ../FL/fl_string_functions.h
 template_panel.o: ../FL/fl_types.h
 template_panel.o: ../FL/fl_utf8.h
 template_panel.o: ../FL/Fl_Widget.H
diff --git a/fluid/print_panel.cxx b/fluid/print_panel.cxx
index 0d688d403..3633c8ace 100644
--- a/fluid/print_panel.cxx
+++ b/fluid/print_panel.cxx
@@ -18,7 +18,7 @@
 
 #include "print_panel.h"
 #include "fluid.h"
-#include <FL/fl_string.h>
+#include <FL/fl_string_functions.h>
 #include "../src/flstring.h"
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/fluid/print_panel.fl b/fluid/print_panel.fl
index 48cb43ead..e85f3493b 100644
--- a/fluid/print_panel.fl
+++ b/fluid/print_panel.fl
@@ -23,7 +23,7 @@ comment {//
 decl {\#include "fluid.h"} {private local
 }
 
-decl {\#include <FL/fl_string.h>} {private local
+decl {\#include <FL/fl_string_functions.h>} {private local
 }
 
 decl {\#include "../src/flstring.h"} {private local
diff --git a/fluid/shell_command.cxx b/fluid/shell_command.cxx
index 147525989..630b84b1f 100644
--- a/fluid/shell_command.cxx
+++ b/fluid/shell_command.cxx
@@ -21,7 +21,7 @@
 
 #include <FL/Fl_Double_Window.H>
 #include <FL/fl_message.H>
-#include <FL/fl_string.h>
+#include <FL/fl_string_functions.h>
 
 #include <errno.h>
 
diff --git a/fluid/template_panel.cxx b/fluid/template_panel.cxx
index 0c4db0d32..b23bc9668 100644
--- a/fluid/template_panel.cxx
+++ b/fluid/template_panel.cxx
@@ -20,7 +20,7 @@
 #include "fluid.h"
 #include <FL/Fl_Shared_Image.H>
 #include <FL/fl_ask.H>
-#include <FL/fl_string.h>
+#include <FL/fl_string_functions.h>
 #include <FL/filename.H>
 #include "../src/flstring.h"
 #include <stdio.h>
diff --git a/fluid/template_panel.fl b/fluid/template_panel.fl
index 9407a7564..7b5f9b1c3 100644
--- a/fluid/template_panel.fl
+++ b/fluid/template_panel.fl
@@ -29,7 +29,7 @@ decl {\#include <FL/Fl_Shared_Image.H>} {private local
 decl {\#include <FL/fl_ask.H>} {private local
 }
 
-decl {\#include <FL/fl_string.h>} {private local
+decl {\#include <FL/fl_string_functions.h>} {private local
 }
 
 decl {\#include <FL/filename.H>} {selected private local