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).
This commit is contained in:
Albrecht Schlosser
2022-01-16 19:02:36 +01:00
parent 8213ba94aa
commit 92e9181a0a
62 changed files with 117 additions and 101 deletions
+5 -5
View File
@@ -1,7 +1,7 @@
/*
* Platform agnostic string portability functions for the Fast Light Tool Kit (FLTK).
*
* Copyright 2020 by Bill Spitzak and others.
* Copyright 2020-2022 by Bill Spitzak and others.
*
* This library is free software. Distribution and use rights are outlined in
* the file "COPYING" which should have been included with this file. If this
@@ -15,12 +15,12 @@
*/
/**
\file fl_string.h
\file fl_string_functions.h
\brief Public header for FLTK's own platform agnostic string handling.
*/
#ifndef _FL_fl_string_h_
#define _FL_fl_string_h_
#ifndef _FL_fl_string_functions_h_
#define _FL_fl_string_functions_h_
#include "Fl_Export.H"
#include "fl_types.h"
@@ -44,4 +44,4 @@ FL_EXPORT char* fl_strdup(const char *s);
#endif /* __cplusplus */
#endif /* _FL_fl_string_h_ */
#endif /* _FL_fl_string_functions_h_ */
+1 -1
View File
@@ -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() */
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+8 -8
View File
@@ -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
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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
+1 -1
View File
@@ -156,7 +156,7 @@ set (CPPFILES
fl_shadow_box.cxx
fl_shortcut.cxx
fl_show_colormap.cxx
fl_string.cxx
fl_string_functions.cxx
fl_symbols.cxx
fl_utf8.cxx
fl_vertex.cxx
+1 -1
View File
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include "flstring.h"
#include <FL/fl_draw.H>
#include <FL/fl_string.h> // fl_strdup()
#include <FL/fl_string_functions.h> // fl_strdup()
#include <FL/Fl_Check_Browser.H>
/* This uses a cache for faster access when you're scanning the list
+1 -1
View File
@@ -34,7 +34,7 @@
#include "Fl_System_Driver.H"
#include <FL/fl_draw.H>
#include <FL/filename.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <FL/Fl_Image.H> // icon
#include <stdio.h>
#include <stdlib.h>
+1 -1
View File
@@ -354,7 +354,7 @@
#include <FL/platform.H>
#include <FL/Fl_Shared_Image.H>
#include <FL/fl_draw.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <stdio.h>
#include <stdlib.h>
+1 -1
View File
@@ -56,7 +56,7 @@
#include <stdlib.h>
#include <FL/fl_utf8.h>
#include <FL/filename.H> // fl_open_uri()
#include <FL/fl_string.h> // fl_strdup()
#include <FL/fl_string_functions.h> // fl_strdup()
#include "flstring.h"
#include <ctype.h>
#include <errno.h>
+1 -1
View File
@@ -22,7 +22,7 @@
#include "Fl_Image_Reader.h"
#include <FL/fl_utf8.h>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <stdlib.h>
#include <string.h>
+1 -1
View File
@@ -17,7 +17,7 @@
#if defined(__APPLE__)
#include <FL/platform.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include "drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H"
#include "flstring.h"
#include <stdio.h>
+1 -1
View File
@@ -25,7 +25,7 @@
// string with a % sign in it!
#include <FL/Fl_Menu_.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include "flstring.h"
#include <stdio.h>
#include <stdlib.h>
+1 -1
View File
@@ -47,7 +47,7 @@
#include "flstring.h"
#include <FL/fl_ask.H>
#include "Fl_Message.h" // intentionally "hidden" in src/...
#include "FL/fl_string.h" // fl_strdup()
#include "FL/fl_string_functions.h" // fl_strdup()
#include <FL/Fl_Window.H>
#include <FL/Fl_Box.H>
+1 -1
View File
@@ -26,7 +26,7 @@
#include <FL/Fl_Shared_Image.H>
#include <FL/Fl_Image_Surface.H>
#include <FL/fl_draw.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <dlfcn.h> // for dlopen et al
#include "drivers/X11/Fl_X11_System_Driver.H"
#include "Fl_Window_Driver.H"
+1 -1
View File
@@ -27,7 +27,7 @@
#include <FL/Fl_Native_File_Chooser.H>
#include <FL/Fl_File_Chooser.H>
#include <FL/filename.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#define MAXFILTERS 80
#import <Cocoa/Cocoa.h>
+1 -1
View File
@@ -29,7 +29,7 @@
#define FNFC_MAX_PATH 32768 // XXX: MAX_PATH under win32 is 260, too small for modern use
#include <FL/fl_string.h> // fl_strdup()
#include <FL/fl_string_functions.h> // fl_strdup()
#include "flstring.h" // fl_strlcpy()/cat()
#include <FL/Fl_Native_File_Chooser.H>
# include <windows.h>
+1 -1
View File
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <FL/fl_utf8.h>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include "flstring.h"
+1 -1
View File
@@ -21,7 +21,7 @@
#include <FL/Fl_SVG_Image.H>
#include <FL/fl_utf8.h>
#include <FL/fl_draw.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include "Fl_Screen_Driver.H"
#include <stdio.h>
#include <stdlib.h>
+1 -1
View File
@@ -17,7 +17,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <FL/fl_utf8.h>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include "flstring.h"
#include <ctype.h>
#include <FL/Fl.H>
+1 -1
View File
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <FL/fl_utf8.h>
#include <FL/fl_string.h> // fl_strdup()
#include <FL/fl_string_functions.h> // fl_strdup()
#include "flstring.h"
#include <limits.h>
#include <ctype.h>
+1 -1
View File
@@ -18,7 +18,7 @@
#include <FL/fl_draw.H>
#include <FL/Fl_Menu_Window.H>
#include <FL/Fl.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include "Fl_System_Driver.H"
#include <stdio.h>
+1 -1
View File
@@ -6,7 +6,7 @@
#include <FL/Fl_Tree.H>
#include <FL/Fl_Preferences.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
//////////////////////
// Fl_Tree.cxx
+1 -1
View File
@@ -8,7 +8,7 @@
#include <FL/Fl_Tree_Item.H>
#include <FL/Fl_Tree_Prefs.H>
#include <FL/Fl_Tree.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
//////////////////////
// Fl_Tree_Item.cxx
+1 -1
View File
@@ -19,7 +19,7 @@
#include <FL/Fl_Group.H>
#include <FL/Fl_Tooltip.H>
#include <FL/fl_draw.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <stdlib.h>
#include "flstring.h"
+1 -1
View File
@@ -28,7 +28,7 @@
#include <FL/Fl_Window.H>
#include <FL/Fl_Tooltip.H>
#include <FL/fl_draw.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <stdlib.h>
#include "flstring.h"
+1 -1
View File
@@ -32,7 +32,7 @@ extern "C" {
#include <FL/Fl_Printer.H>
#include <FL/fl_draw.H>
#include <FL/Fl_Rect.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include "drivers/Quartz/Fl_Quartz_Graphics_Driver.H"
#include "drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H"
#include "drivers/Cocoa/Fl_Cocoa_Screen_Driver.H"
+1 -1
View File
@@ -21,7 +21,7 @@
#include <FL/platform.H>
#include <FL/math.h>
#include <FL/fl_utf8.h>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include "flstring.h"
#include <stdio.h>
#include <stdlib.h>
+1 -1
View File
@@ -60,7 +60,7 @@ void fl_cleanup_dc_list(void);
#include "drivers/WinAPI/Fl_WinAPI_Screen_Driver.H"
#include "drivers/GDI/Fl_GDI_Graphics_Driver.H"
#include <FL/fl_utf8.h>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <FL/Fl_Window.H>
#include <FL/fl_draw.H>
#include <FL/Enumerations.H>
+1 -1
View File
@@ -158,7 +158,7 @@ CPPFILES = \
fl_shadow_box.cxx \
fl_shortcut.cxx \
fl_show_colormap.cxx \
fl_string.cxx \
fl_string_functions.cxx \
fl_symbols.cxx \
fl_utf8.cxx \
fl_vertex.cxx \
@@ -25,7 +25,7 @@
#include <FL/platform.H>
#include <FL/fl_draw.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <jni.h>
@@ -23,7 +23,7 @@
#define FL_ANDROID_SYSTEM_DRIVER_H
#include <string.h>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include "../../Fl_System_Driver.H"
#include <stdarg.h>
@@ -18,7 +18,7 @@
#include "Fl_Android_System_Driver.H"
#include <FL/Fl.H>
#include <FL/fl_utf8.h>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <FL/filename.H>
#include <FL/Fl_File_Browser.H>
#include <FL/Fl_File_Icon.H>
+1 -1
View File
@@ -26,7 +26,7 @@
#include <FL/platform.H>
#include <FL/fl_ask.H>
#include <FL/fl_draw.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#import <Cocoa/Cocoa.h>
typedef OSStatus (*PMSessionSetDocumentFormatGeneration_type)(
@@ -43,7 +43,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
// This function fills in the FLTK font table with all the fonts that
// are found on the X server. It tries to place the fonts into families
+1 -1
View File
@@ -19,7 +19,7 @@
#include "../../flstring.h"
#include <FL/Fl_File_Icon.H>
#include <FL/filename.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <FL/Fl.H>
#include <locale.h>
#include <stdio.h>
+1 -1
View File
@@ -24,7 +24,7 @@
#include <FL/Fl_PostScript.H>
#include <FL/Fl_Native_File_Chooser.H>
#include "../../Fl_System_Driver.H"
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <FL/platform.H>
#include <stdarg.h>
#include <time.h>
@@ -75,7 +75,7 @@
#include <FL/Fl.H>
#include <FL/platform.H>
#include <FL/fl_utf8.h> // for fl_utf8toUtf16()
#include <FL/fl_string.h> // fl_strdup()
#include <FL/fl_string_functions.h> // fl_strdup()
Fl_Fontdesc* fl_fonts = NULL;
+1 -1
View File
@@ -28,7 +28,7 @@
#include <FL/Fl_RGB_Image.H>
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Bitmap.H>
#include <FL/fl_string.h>
#include <FL/fl_string_functions.h>
#include <stdlib.h>
extern "C" {
@@ -19,7 +19,7 @@
#include "Fl_WinAPI_System_Driver.H"
#include <FL/Fl.H>
#include <FL/fl_utf8.h>
#include <FL/fl_string.h> // fl_strdup()
#include <FL/fl_string_functions.h> // fl_strdup()
#include <FL/filename.H>
#include <FL/Fl_File_Browser.H>
#include <FL/Fl_File_Icon.H>
+1 -1
View File
@@ -17,7 +17,7 @@
#include "Fl_X11_System_Driver.H"
#include <FL/Fl_File_Browser.H>
#include <FL/fl_string.h> // fl_strdup
#include <FL/fl_string_functions.h> // fl_strdup
#include <FL/platform.H>
#include "../../flstring.h"

Some files were not shown because too many files have changed in this diff Show More