From 7a7e50df6ee3b9ab658cf165fd199f6214f4983d Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 4 Dec 2021 15:34:41 +0100 Subject: Rename FL/Fl_String.H to FL/Fl_String_class.H The previous name existed already with different case (fl_string.h) in the FL folder which broke the build on macOS and Windows. This may be a temporary fix - until I find a better way. --- FL/Fl_String.H | 114 --------------------------------------------------- FL/Fl_String_class.H | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++ FL/fl_ask.H | 2 +- fluid/makedepend | 13 ++++-- src/Fl_String.cxx | 2 +- src/makedepend | 52 ++++++++++++----------- test/makedepend | 51 ++++++++++++----------- 7 files changed, 180 insertions(+), 168 deletions(-) delete mode 100644 FL/Fl_String.H create mode 100644 FL/Fl_String_class.H diff --git a/FL/Fl_String.H b/FL/Fl_String.H deleted file mode 100644 index 471178cd6..000000000 --- a/FL/Fl_String.H +++ /dev/null @@ -1,114 +0,0 @@ -// -// Basic Fl_String header for the Fast Light Tool Kit (FLTK). -// -// Copyright 2021 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 -// file is missing or damaged, see the license at: -// -// https://www.fltk.org/COPYING.php -// -// Please see the following page on how to report bugs and issues: -// -// https://www.fltk.org/bugs.php -// - -#ifndef _FL_FL_STRING_H_ -#define _FL_FL_STRING_H_ - -/** \file FL/Fl_String.H - Basic Fl_String class for FLTK. -*/ - -/** - Fl_String is the basic string class for FLTK. - - In this version Fl_String can be used to store strings, copy strings, - and move strings. There are no string manipulation methods yet. - - Fl_String can hold the value of an Fl_Input widget including \e nul bytes - if the constructor Fl_String(const char *str, int size) is used. - - Assignment and copy constructors \b copy the string value such that the - source string can be freed immediately after the assignment. - - The string value() can be an empty string \c "" or \c NULL. - - If value() is not \c NULL it is guaranteed that the string is terminated by - a trailing \c nul byte even if the string contains embedded \c nul bytes. - - The method size() returns the full string size, whether the string contains - embedded \c nul bytes or not. The special method slen() returns 0 if value() - is \c NULL, otherwise the same as \c strlen() would do. - - Examples: - \code - Fl_String np(NULL); - printf(" np : value = %p, size = %d, slen = %d\n", np.value(), np.size(), np.slen()); - Fl_String empty(""); - printf(" empty : value = %p, size = %d\n", empty.value(), empty.size()); - Fl_String fltk("FLTK"); - Fl_Input i(0, 0, 0, 0); - i.value("abc\0def", 7); - Fl_String str(i.value(), i.size()); - printf(" str : strlen = %lu, size = %d, capacity = %d\n", - strlen(str.value()), str.size(), str.capacity()); - - Output: - - np : value = (nil), size = 0, slen = 0 - empty : value = 0x562840befbf0, size = 0 - str : strlen = 3, size = 7, capacity = 15 - \endcode - - \since 1.4.0 - - \todo Complete documentation of class Fl_String -*/ - -class Fl_String { -private: - int size_; - char *value_; - int capacity_; - -public: - Fl_String(); - Fl_String(const char *str); - Fl_String(const char *str, int size); - - // copy constructor - Fl_String(const Fl_String &in); - - // copy assignment operator - Fl_String& operator=(const Fl_String &in); - - // assignment operator for 'const char *' - Fl_String& operator=(const char *in); - - virtual ~Fl_String(); - -private: - void init(); - void alloc_buf(int size); - void release(); - -public: - void value(const char *str); - void value(const char *str, int slen); - - const char *value() const { return value_; } - int size() const { return size_; } - - int slen() const; - int capacity() const; - - // ================================== DEBUG ================================== - - void debug(const char *info) const; // output string info - void hexdump(const char *info) const; // output info + hexdump - -}; // class Fl_String - -#endif // _FL_FL_STRING_H_ diff --git a/FL/Fl_String_class.H b/FL/Fl_String_class.H new file mode 100644 index 000000000..938e0d674 --- /dev/null +++ b/FL/Fl_String_class.H @@ -0,0 +1,114 @@ +// +// Basic Fl_String header for the Fast Light Tool Kit (FLTK). +// +// Copyright 2021 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 +// file is missing or damaged, see the license at: +// +// https://www.fltk.org/COPYING.php +// +// Please see the following page on how to report bugs and issues: +// +// https://www.fltk.org/bugs.php +// + +#ifndef _FL_Fl_String_class_H_ +#define _FL_Fl_String_class_H_ + +/** \file FL/Fl_String_class.H + Basic Fl_String class for FLTK. +*/ + +/** + Fl_String is the basic string class for FLTK. + + In this version Fl_String can be used to store strings, copy strings, + and move strings. There are no string manipulation methods yet. + + Fl_String can hold the value of an Fl_Input widget including \e nul bytes + if the constructor Fl_String(const char *str, int size) is used. + + Assignment and copy constructors \b copy the string value such that the + source string can be freed immediately after the assignment. + + The string value() can be an empty string \c "" or \c NULL. + + If value() is not \c NULL it is guaranteed that the string is terminated by + a trailing \c nul byte even if the string contains embedded \c nul bytes. + + The method size() returns the full string size, whether the string contains + embedded \c nul bytes or not. The special method slen() returns 0 if value() + is \c NULL, otherwise the same as \c strlen() would do. + + Examples: + \code + Fl_String np(NULL); + printf(" np : value = %p, size = %d, slen = %d\n", np.value(), np.size(), np.slen()); + Fl_String empty(""); + printf(" empty : value = %p, size = %d\n", empty.value(), empty.size()); + Fl_String fltk("FLTK"); + Fl_Input i(0, 0, 0, 0); + i.value("abc\0def", 7); + Fl_String str(i.value(), i.size()); + printf(" str : strlen = %lu, size = %d, capacity = %d\n", + strlen(str.value()), str.size(), str.capacity()); + + Output: + + np : value = (nil), size = 0, slen = 0 + empty : value = 0x562840befbf0, size = 0 + str : strlen = 3, size = 7, capacity = 15 + \endcode + + \since 1.4.0 + + \todo Complete documentation of class Fl_String +*/ + +class Fl_String { +private: + int size_; + char *value_; + int capacity_; + +public: + Fl_String(); + Fl_String(const char *str); + Fl_String(const char *str, int size); + + // copy constructor + Fl_String(const Fl_String &in); + + // copy assignment operator + Fl_String& operator=(const Fl_String &in); + + // assignment operator for 'const char *' + Fl_String& operator=(const char *in); + + virtual ~Fl_String(); + +private: + void init(); + void alloc_buf(int size); + void release(); + +public: + void value(const char *str); + void value(const char *str, int slen); + + const char *value() const { return value_; } + int size() const { return size_; } + + int slen() const; + int capacity() const; + + // ================================== DEBUG ================================== + + void debug(const char *info) const; // output string info + void hexdump(const char *info) const; // output info + hexdump + +}; // class Fl_String + +#endif // _FL_Fl_String_class_H_ diff --git a/FL/fl_ask.H b/FL/fl_ask.H index de76ebd37..b96c94d30 100644 --- a/FL/fl_ask.H +++ b/FL/fl_ask.H @@ -22,7 +22,7 @@ #define _FL_fl_ask_H_ #include -#include +#include #include class Fl_Widget; diff --git a/fluid/makedepend b/fluid/makedepend index b80ae7d0e..eb4994c01 100644 --- a/fluid/makedepend +++ b/fluid/makedepend @@ -55,7 +55,7 @@ alignment_panel.o: ../FL/Fl_Scrollbar.H alignment_panel.o: ../FL/Fl_Simple_Terminal.H alignment_panel.o: ../FL/Fl_Slider.H alignment_panel.o: ../FL/Fl_Spinner.H -alignment_panel.o: ../FL/Fl_String.H +alignment_panel.o: ../FL/Fl_String_class.H alignment_panel.o: ../FL/Fl_Tabs.H alignment_panel.o: ../FL/Fl_Text_Buffer.H alignment_panel.o: ../FL/Fl_Text_Display.H @@ -202,7 +202,8 @@ ExternalCodeEditor_UNIX.o: ../FL/fl_ask.H ExternalCodeEditor_UNIX.o: ../FL/fl_attr.h ExternalCodeEditor_UNIX.o: ../FL/fl_casts.H ExternalCodeEditor_UNIX.o: ../FL/Fl_Export.H -ExternalCodeEditor_UNIX.o: ../FL/Fl_String.H +ExternalCodeEditor_UNIX.o: ../FL/fl_string.h +ExternalCodeEditor_UNIX.o: ../FL/Fl_String_class.H ExternalCodeEditor_UNIX.o: ../FL/fl_types.h ExternalCodeEditor_UNIX.o: ../FL/fl_utf8.h ExternalCodeEditor_UNIX.o: ../FL/platform_types.h @@ -408,7 +409,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.h +fluid.o: ../FL/Fl_String_class.H fluid.o: ../FL/Fl_Tabs.H fluid.o: ../FL/Fl_Text_Buffer.H fluid.o: ../FL/Fl_Text_Display.H @@ -480,6 +482,7 @@ Fluid_Image.o: ../FL/Fl_Scrollbar.H Fluid_Image.o: ../FL/Fl_Shared_Image.H Fluid_Image.o: ../FL/Fl_Slider.H Fluid_Image.o: ../FL/fl_string.h +Fluid_Image.o: ../FL/Fl_String_class.H Fluid_Image.o: ../FL/Fl_Tabs.H Fluid_Image.o: ../FL/Fl_Tile.H Fluid_Image.o: ../FL/fl_types.h @@ -544,7 +547,8 @@ Fl_Function_Type.o: ../FL/fl_show_input.H Fl_Function_Type.o: ../FL/Fl_Simple_Terminal.H Fl_Function_Type.o: ../FL/Fl_Slider.H Fl_Function_Type.o: ../FL/Fl_Spinner.H -Fl_Function_Type.o: ../FL/Fl_String.H +Fl_Function_Type.o: ../FL/fl_string.h +Fl_Function_Type.o: ../FL/Fl_String_class.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 @@ -1003,6 +1007,7 @@ template_panel.o: ../FL/Fl_Scrollbar.H template_panel.o: ../FL/Fl_Shared_Image.H template_panel.o: ../FL/Fl_Slider.H template_panel.o: ../FL/fl_string.h +template_panel.o: ../FL/Fl_String_class.H template_panel.o: ../FL/fl_types.h template_panel.o: ../FL/fl_utf8.h template_panel.o: ../FL/Fl_Valuator.H diff --git a/src/Fl_String.cxx b/src/Fl_String.cxx index c4417523c..f0aa4f405 100644 --- a/src/Fl_String.cxx +++ b/src/Fl_String.cxx @@ -14,7 +14,7 @@ // https://www.fltk.org/bugs.php // -#include +#include #include #include diff --git a/src/makedepend b/src/makedepend index d719a269f..5f11d0d56 100644 --- a/src/makedepend +++ b/src/makedepend @@ -207,7 +207,8 @@ drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Repeat_Button.H drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Return_Button.H drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Round_Button.H drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Spinner.H -drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_String.H +drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_string.h +drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_String_class.H drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_types.h drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_utf8.h drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Widget.H @@ -273,7 +274,8 @@ drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Plugin.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_PostScript.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Preferences.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Return_Button.H -drivers/PostScript/Fl_PostScript.o: ../FL/Fl_String.H +drivers/PostScript/Fl_PostScript.o: ../FL/fl_string.h +drivers/PostScript/Fl_PostScript.o: ../FL/Fl_String_class.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Tile.H drivers/PostScript/Fl_PostScript.o: ../FL/fl_types.h drivers/PostScript/Fl_PostScript.o: ../FL/fl_utf8.h @@ -397,7 +399,7 @@ drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_RGB_Image.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Scrollbar.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Shared_Image.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Slider.H -drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_String.H +drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_String_class.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Text_Buffer.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Text_Display.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Text_Editor.H @@ -464,7 +466,7 @@ drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_RGB_Image.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Scrollbar.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Single_Window.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Slider.H -drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_String.H +drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_String_class.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Text_Buffer.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Text_Display.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Text_Editor.H @@ -932,7 +934,7 @@ fl_ask.o: ../FL/Fl_Rect.H fl_ask.o: ../FL/Fl_RGB_Image.H fl_ask.o: ../FL/Fl_Scrollbar.H fl_ask.o: ../FL/Fl_Slider.H -fl_ask.o: ../FL/Fl_String.H +fl_ask.o: ../FL/Fl_String_class.H fl_ask.o: ../FL/Fl_Text_Buffer.H fl_ask.o: ../FL/Fl_Text_Display.H fl_ask.o: ../FL/Fl_Text_Editor.H @@ -1497,7 +1499,7 @@ Fl_File_Chooser.o: ../FL/Fl_Menu_Button.H Fl_File_Chooser.o: ../FL/Fl_Menu_Item.H Fl_File_Chooser.o: ../FL/Fl_Preferences.H Fl_File_Chooser.o: ../FL/Fl_Return_Button.H -Fl_File_Chooser.o: ../FL/Fl_String.H +Fl_File_Chooser.o: ../FL/Fl_String_class.H Fl_File_Chooser.o: ../FL/Fl_Tile.H Fl_File_Chooser.o: ../FL/fl_types.h Fl_File_Chooser.o: ../FL/fl_utf8.h @@ -1535,7 +1537,8 @@ Fl_File_Chooser2.o: ../FL/Fl_Menu_Item.H Fl_File_Chooser2.o: ../FL/Fl_Preferences.H Fl_File_Chooser2.o: ../FL/Fl_Return_Button.H Fl_File_Chooser2.o: ../FL/Fl_Shared_Image.H -Fl_File_Chooser2.o: ../FL/Fl_String.H +Fl_File_Chooser2.o: ../FL/fl_string.h +Fl_File_Chooser2.o: ../FL/Fl_String_class.H Fl_File_Chooser2.o: ../FL/Fl_Tile.H Fl_File_Chooser2.o: ../FL/fl_types.h Fl_File_Chooser2.o: ../FL/fl_utf8.h @@ -1574,7 +1577,7 @@ fl_file_dir.o: ../FL/Fl_Menu_Button.H fl_file_dir.o: ../FL/Fl_Menu_Item.H fl_file_dir.o: ../FL/Fl_Preferences.H fl_file_dir.o: ../FL/Fl_Return_Button.H -fl_file_dir.o: ../FL/Fl_String.H +fl_file_dir.o: ../FL/Fl_String_class.H fl_file_dir.o: ../FL/Fl_Tile.H fl_file_dir.o: ../FL/fl_types.h fl_file_dir.o: ../FL/fl_utf8.h @@ -1895,7 +1898,7 @@ Fl_Help_Dialog.o: ../FL/Fl_RGB_Image.H Fl_Help_Dialog.o: ../FL/Fl_Scrollbar.H Fl_Help_Dialog.o: ../FL/Fl_Shared_Image.H Fl_Help_Dialog.o: ../FL/Fl_Slider.H -Fl_Help_Dialog.o: ../FL/Fl_String.H +Fl_Help_Dialog.o: ../FL/Fl_String_class.H Fl_Help_Dialog.o: ../FL/fl_types.h Fl_Help_Dialog.o: ../FL/fl_utf8.h Fl_Help_Dialog.o: ../FL/Fl_Valuator.H @@ -2021,7 +2024,7 @@ Fl_Input.o: ../FL/Fl_RGB_Image.H Fl_Input.o: ../FL/Fl_Scrollbar.H Fl_Input.o: ../FL/Fl_Secret_Input.H Fl_Input.o: ../FL/Fl_Slider.H -Fl_Input.o: ../FL/Fl_String.H +Fl_Input.o: ../FL/Fl_String_class.H Fl_Input.o: ../FL/Fl_Text_Buffer.H Fl_Input.o: ../FL/Fl_Text_Display.H Fl_Input.o: ../FL/Fl_Text_Editor.H @@ -2057,7 +2060,7 @@ Fl_Input_.o: ../FL/Fl_Rect.H Fl_Input_.o: ../FL/Fl_RGB_Image.H Fl_Input_.o: ../FL/Fl_Scrollbar.H Fl_Input_.o: ../FL/Fl_Slider.H -Fl_Input_.o: ../FL/Fl_String.H +Fl_Input_.o: ../FL/Fl_String_class.H Fl_Input_.o: ../FL/Fl_Text_Buffer.H Fl_Input_.o: ../FL/Fl_Text_Display.H Fl_Input_.o: ../FL/Fl_Text_Editor.H @@ -2262,7 +2265,7 @@ Fl_Message.o: ../FL/Fl_Input.H Fl_Message.o: ../FL/Fl_Input_.H Fl_Message.o: ../FL/Fl_Return_Button.H Fl_Message.o: ../FL/Fl_Secret_Input.H -Fl_Message.o: ../FL/Fl_String.H +Fl_Message.o: ../FL/Fl_String_class.H Fl_Message.o: ../FL/fl_types.h Fl_Message.o: ../FL/fl_utf8.h Fl_Message.o: ../FL/Fl_Widget.H @@ -2311,7 +2314,7 @@ Fl_Native_File_Chooser.o: ../FL/Fl_Menu_Item.H Fl_Native_File_Chooser.o: ../FL/Fl_Native_File_Chooser.H Fl_Native_File_Chooser.o: ../FL/Fl_Preferences.H Fl_Native_File_Chooser.o: ../FL/Fl_Return_Button.H -Fl_Native_File_Chooser.o: ../FL/Fl_String.H +Fl_Native_File_Chooser.o: ../FL/Fl_String_class.H Fl_Native_File_Chooser.o: ../FL/Fl_Tile.H Fl_Native_File_Chooser.o: ../FL/fl_types.h Fl_Native_File_Chooser.o: ../FL/fl_utf8.h @@ -2347,7 +2350,7 @@ Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Menu_Item.H Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Native_File_Chooser.H Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Preferences.H Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Return_Button.H -Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_String.H +Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_String_class.H Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Tile.H Fl_Native_File_Chooser_FLTK.o: ../FL/fl_types.h Fl_Native_File_Chooser_FLTK.o: ../FL/fl_utf8.h @@ -2391,7 +2394,8 @@ Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Plugin.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Preferences.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Return_Button.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Shared_Image.H -Fl_Native_File_Chooser_GTK.o: ../FL/Fl_String.H +Fl_Native_File_Chooser_GTK.o: ../FL/fl_string.h +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_String_class.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Tile.H Fl_Native_File_Chooser_GTK.o: ../FL/fl_types.h Fl_Native_File_Chooser_GTK.o: ../FL/fl_utf8.h @@ -2963,7 +2967,8 @@ fl_string.o: ../FL/Fl.H fl_string.o: ../FL/fl_casts.H fl_string.o: ../FL/Fl_Export.H fl_string.o: ../FL/Fl_Preferences.H -Fl_String.o: ../FL/Fl_String.H +fl_string.o: ../FL/fl_string.h +Fl_String.o: ../FL/Fl_String_class.H fl_string.o: ../FL/fl_types.h fl_string.o: ../FL/fl_utf8.h fl_string.o: ../FL/platform_types.h @@ -3101,6 +3106,7 @@ Fl_Text_Buffer.o: ../FL/fl_attr.h Fl_Text_Buffer.o: ../FL/fl_casts.H Fl_Text_Buffer.o: ../FL/Fl_Export.H Fl_Text_Buffer.o: ../FL/fl_string.h +Fl_Text_Buffer.o: ../FL/Fl_String_class.H Fl_Text_Buffer.o: ../FL/Fl_Text_Buffer.H Fl_Text_Buffer.o: ../FL/fl_types.h Fl_Text_Buffer.o: ../FL/fl_utf8.h @@ -3159,7 +3165,7 @@ Fl_Text_Editor.o: ../FL/Fl_Rect.H Fl_Text_Editor.o: ../FL/Fl_RGB_Image.H Fl_Text_Editor.o: ../FL/Fl_Scrollbar.H Fl_Text_Editor.o: ../FL/Fl_Slider.H -Fl_Text_Editor.o: ../FL/Fl_String.H +Fl_Text_Editor.o: ../FL/Fl_String_class.H Fl_Text_Editor.o: ../FL/Fl_Text_Buffer.H Fl_Text_Editor.o: ../FL/Fl_Text_Display.H Fl_Text_Editor.o: ../FL/Fl_Text_Editor.H @@ -3597,7 +3603,7 @@ Fl_x.o: ../FL/Fl_RGB_Image.H Fl_x.o: ../FL/Fl_Scrollbar.H Fl_x.o: ../FL/Fl_Shared_Image.H Fl_x.o: ../FL/Fl_Slider.H -Fl_x.o: ../FL/Fl_String.H +Fl_x.o: ../FL/Fl_String_class.H Fl_x.o: ../FL/Fl_Text_Buffer.H Fl_x.o: ../FL/Fl_Text_Display.H Fl_x.o: ../FL/Fl_Text_Editor.H @@ -3694,7 +3700,7 @@ forms_bitmap.o: ../FL/Fl_RGB_Image.H forms_bitmap.o: ../FL/Fl_Round_Button.H forms_bitmap.o: ../FL/fl_show_colormap.H forms_bitmap.o: ../FL/Fl_Slider.H -forms_bitmap.o: ../FL/Fl_String.H +forms_bitmap.o: ../FL/Fl_String_class.H forms_bitmap.o: ../FL/Fl_Tile.H forms_bitmap.o: ../FL/Fl_Timer.H forms_bitmap.o: ../FL/fl_types.h @@ -3753,7 +3759,7 @@ forms_compatibility.o: ../FL/Fl_RGB_Image.H forms_compatibility.o: ../FL/Fl_Round_Button.H forms_compatibility.o: ../FL/fl_show_colormap.H forms_compatibility.o: ../FL/Fl_Slider.H -forms_compatibility.o: ../FL/Fl_String.H +forms_compatibility.o: ../FL/Fl_String_class.H forms_compatibility.o: ../FL/Fl_Tile.H forms_compatibility.o: ../FL/Fl_Timer.H forms_compatibility.o: ../FL/fl_types.h @@ -3822,7 +3828,7 @@ forms_fselect.o: ../FL/Fl_RGB_Image.H forms_fselect.o: ../FL/Fl_Round_Button.H forms_fselect.o: ../FL/fl_show_colormap.H forms_fselect.o: ../FL/Fl_Slider.H -forms_fselect.o: ../FL/Fl_String.H +forms_fselect.o: ../FL/Fl_String_class.H forms_fselect.o: ../FL/Fl_Tile.H forms_fselect.o: ../FL/Fl_Timer.H forms_fselect.o: ../FL/fl_types.h @@ -3881,7 +3887,7 @@ forms_pixmap.o: ../FL/Fl_RGB_Image.H forms_pixmap.o: ../FL/Fl_Round_Button.H forms_pixmap.o: ../FL/fl_show_colormap.H forms_pixmap.o: ../FL/Fl_Slider.H -forms_pixmap.o: ../FL/Fl_String.H +forms_pixmap.o: ../FL/Fl_String_class.H forms_pixmap.o: ../FL/Fl_Tile.H forms_pixmap.o: ../FL/Fl_Timer.H forms_pixmap.o: ../FL/fl_types.h @@ -3939,7 +3945,7 @@ forms_timer.o: ../FL/Fl_RGB_Image.H forms_timer.o: ../FL/Fl_Round_Button.H forms_timer.o: ../FL/fl_show_colormap.H forms_timer.o: ../FL/Fl_Slider.H -forms_timer.o: ../FL/Fl_String.H +forms_timer.o: ../FL/Fl_String_class.H forms_timer.o: ../FL/Fl_Tile.H forms_timer.o: ../FL/Fl_Timer.H forms_timer.o: ../FL/fl_types.h diff --git a/test/makedepend b/test/makedepend index 4f4e5e76d..001c381bb 100644 --- a/test/makedepend +++ b/test/makedepend @@ -83,7 +83,7 @@ ask.o: ../FL/Fl_Image.H ask.o: ../FL/Fl_Input.H ask.o: ../FL/Fl_Input_.H ask.o: ../FL/Fl_Return_Button.H -ask.o: ../FL/Fl_String.H +ask.o: ../FL/Fl_String_class.H ask.o: ../FL/fl_types.h ask.o: ../FL/fl_utf8.h ask.o: ../FL/Fl_Widget.H @@ -204,7 +204,7 @@ browser.o: ../FL/Fl_Scrollbar.H browser.o: ../FL/Fl_Select_Browser.H browser.o: ../FL/Fl_Simple_Terminal.H browser.o: ../FL/Fl_Slider.H -browser.o: ../FL/Fl_String.H +browser.o: ../FL/Fl_String_class.H browser.o: ../FL/Fl_Text_Buffer.H browser.o: ../FL/Fl_Text_Display.H browser.o: ../FL/fl_types.h @@ -224,7 +224,7 @@ button.o: ../FL/fl_casts.H button.o: ../FL/Fl_Export.H button.o: ../FL/Fl_Group.H button.o: ../FL/Fl_Image.H -button.o: ../FL/Fl_String.H +button.o: ../FL/Fl_String_class.H button.o: ../FL/fl_types.h button.o: ../FL/fl_utf8.h button.o: ../FL/Fl_Widget.H @@ -300,7 +300,7 @@ checkers.o: ../FL/Fl_Preferences.H checkers.o: ../FL/Fl_Rect.H checkers.o: ../FL/Fl_RGB_Image.H checkers.o: ../FL/Fl_Slider.H -checkers.o: ../FL/Fl_String.H +checkers.o: ../FL/Fl_String_class.H checkers.o: ../FL/fl_types.h checkers.o: ../FL/fl_utf8.h checkers.o: ../FL/Fl_Valuator.H @@ -351,7 +351,7 @@ clipboard.o: ../FL/Fl_RGB_Image.H clipboard.o: ../FL/Fl_Scrollbar.H clipboard.o: ../FL/Fl_Shared_Image.H clipboard.o: ../FL/Fl_Slider.H -clipboard.o: ../FL/Fl_String.H +clipboard.o: ../FL/Fl_String_class.H clipboard.o: ../FL/Fl_Tabs.H clipboard.o: ../FL/Fl_Text_Buffer.H clipboard.o: ../FL/Fl_Text_Display.H @@ -397,7 +397,7 @@ colbrowser.o: ../FL/Fl_Hold_Browser.H colbrowser.o: ../FL/Fl_Image.H colbrowser.o: ../FL/Fl_Scrollbar.H colbrowser.o: ../FL/Fl_Slider.H -colbrowser.o: ../FL/Fl_String.H +colbrowser.o: ../FL/Fl_String_class.H colbrowser.o: ../FL/fl_types.h colbrowser.o: ../FL/fl_utf8.h colbrowser.o: ../FL/Fl_Valuator.H @@ -601,7 +601,7 @@ demo.o: ../FL/Fl_RGB_Image.H demo.o: ../FL/Fl_Scrollbar.H demo.o: ../FL/Fl_Simple_Terminal.H demo.o: ../FL/Fl_Slider.H -demo.o: ../FL/Fl_String.H +demo.o: ../FL/Fl_String_class.H demo.o: ../FL/Fl_Text_Buffer.H demo.o: ../FL/Fl_Text_Display.H demo.o: ../FL/fl_types.h @@ -660,7 +660,7 @@ device.o: ../FL/Fl_Round_Button.H device.o: ../FL/Fl_Scrollbar.H device.o: ../FL/Fl_Shared_Image.H device.o: ../FL/Fl_Slider.H -device.o: ../FL/Fl_String.H +device.o: ../FL/Fl_String_class.H device.o: ../FL/Fl_SVG_File_Surface.H device.o: ../FL/Fl_Tile.H device.o: ../FL/fl_types.h @@ -741,7 +741,7 @@ editor.o: ../FL/Fl_Return_Button.H editor.o: ../FL/Fl_RGB_Image.H editor.o: ../FL/Fl_Scrollbar.H editor.o: ../FL/Fl_Slider.H -editor.o: ../FL/Fl_String.H +editor.o: ../FL/Fl_String_class.H editor.o: ../FL/Fl_Text_Buffer.H editor.o: ../FL/Fl_Text_Display.H editor.o: ../FL/Fl_Text_Editor.H @@ -813,7 +813,7 @@ file_chooser.o: ../FL/Fl_Scrollbar.H file_chooser.o: ../FL/Fl_Shared_Image.H file_chooser.o: ../FL/Fl_Simple_Terminal.H file_chooser.o: ../FL/Fl_Slider.H -file_chooser.o: ../FL/Fl_String.H +file_chooser.o: ../FL/Fl_String_class.H file_chooser.o: ../FL/Fl_Text_Buffer.H file_chooser.o: ../FL/Fl_Text_Display.H file_chooser.o: ../FL/Fl_Tile.H @@ -834,7 +834,7 @@ fltk-versions.o: ../FL/fl_casts.H fltk-versions.o: ../FL/Fl_Export.H fltk-versions.o: ../FL/Fl_Group.H fltk-versions.o: ../FL/Fl_Image.H -fltk-versions.o: ../FL/Fl_String.H +fltk-versions.o: ../FL/Fl_String_class.H fltk-versions.o: ../FL/fl_types.h fltk-versions.o: ../FL/fl_utf8.h fltk-versions.o: ../FL/Fl_Widget.H @@ -880,7 +880,7 @@ fonts.o: ../FL/Fl_Return_Button.H fonts.o: ../FL/Fl_RGB_Image.H fonts.o: ../FL/Fl_Scrollbar.H fonts.o: ../FL/Fl_Slider.H -fonts.o: ../FL/Fl_String.H +fonts.o: ../FL/Fl_String_class.H fonts.o: ../FL/Fl_Tile.H fonts.o: ../FL/fl_types.h fonts.o: ../FL/fl_utf8.h @@ -937,7 +937,7 @@ forms.o: ../FL/Fl_Round_Button.H forms.o: ../FL/Fl_Scrollbar.H forms.o: ../FL/fl_show_colormap.H forms.o: ../FL/Fl_Slider.H -forms.o: ../FL/Fl_String.H +forms.o: ../FL/Fl_String_class.H forms.o: ../FL/Fl_Tile.H forms.o: ../FL/Fl_Timer.H forms.o: ../FL/fl_types.h @@ -1013,7 +1013,7 @@ fullscreen.o: ../FL/Fl_Menu_Item.H fullscreen.o: ../FL/Fl_Scrollbar.H fullscreen.o: ../FL/Fl_Single_Window.H fullscreen.o: ../FL/Fl_Slider.H -fullscreen.o: ../FL/Fl_String.H +fullscreen.o: ../FL/Fl_String_class.H fullscreen.o: ../FL/Fl_Toggle_Light_Button.H fullscreen.o: ../FL/fl_types.h fullscreen.o: ../FL/fl_utf8.h @@ -1430,7 +1430,8 @@ menubar.o: ../FL/Fl_RGB_Image.H menubar.o: ../FL/Fl_Scrollbar.H menubar.o: ../FL/Fl_Simple_Terminal.H menubar.o: ../FL/Fl_Slider.H -menubar.o: ../FL/Fl_String.H +menubar.o: ../FL/fl_string.h +menubar.o: ../FL/Fl_String_class.H menubar.o: ../FL/Fl_Sys_Menu_Bar.H menubar.o: ../FL/Fl_Text_Buffer.H menubar.o: ../FL/Fl_Text_Display.H @@ -1452,7 +1453,7 @@ message.o: ../FL/fl_casts.H message.o: ../FL/Fl_Export.H message.o: ../FL/Fl_Group.H message.o: ../FL/Fl_Image.H -message.o: ../FL/Fl_String.H +message.o: ../FL/Fl_String_class.H message.o: ../FL/fl_types.h message.o: ../FL/fl_utf8.h message.o: ../FL/Fl_Widget.H @@ -1520,7 +1521,7 @@ native-filechooser.o: ../FL/Fl_RGB_Image.H native-filechooser.o: ../FL/Fl_Scrollbar.H native-filechooser.o: ../FL/Fl_Simple_Terminal.H native-filechooser.o: ../FL/Fl_Slider.H -native-filechooser.o: ../FL/Fl_String.H +native-filechooser.o: ../FL/Fl_String_class.H native-filechooser.o: ../FL/Fl_Text_Buffer.H native-filechooser.o: ../FL/Fl_Text_Display.H native-filechooser.o: ../FL/Fl_Tile.H @@ -1709,7 +1710,7 @@ pixmap_browser.o: ../FL/Fl_Return_Button.H pixmap_browser.o: ../FL/Fl_Scrollbar.H pixmap_browser.o: ../FL/Fl_Shared_Image.H pixmap_browser.o: ../FL/Fl_Slider.H -pixmap_browser.o: ../FL/Fl_String.H +pixmap_browser.o: ../FL/Fl_String_class.H pixmap_browser.o: ../FL/Fl_SVG_File_Surface.H pixmap_browser.o: ../FL/Fl_Tile.H pixmap_browser.o: ../FL/fl_types.h @@ -1744,7 +1745,7 @@ preferences.o: ../FL/Fl_Menu_Item.H preferences.o: ../FL/Fl_Preferences.H preferences.o: ../FL/Fl_Round_Button.H preferences.o: ../FL/Fl_Slider.H -preferences.o: ../FL/Fl_String.H +preferences.o: ../FL/Fl_String_class.H preferences.o: ../FL/fl_types.h preferences.o: ../FL/fl_utf8.h preferences.o: ../FL/Fl_Valuator.H @@ -1979,7 +1980,7 @@ resizebox.o: ../FL/Fl_Preferences.H resizebox.o: ../FL/Fl_Radio_Button.H resizebox.o: ../FL/Fl_Rect.H resizebox.o: ../FL/Fl_RGB_Image.H -resizebox.o: ../FL/Fl_String.H +resizebox.o: ../FL/Fl_String_class.H resizebox.o: ../FL/fl_types.h resizebox.o: ../FL/fl_utf8.h resizebox.o: ../FL/Fl_Widget.H @@ -2126,7 +2127,7 @@ sudoku.o: ../FL/Fl_RGB_Image.H sudoku.o: ../FL/Fl_Scrollbar.H sudoku.o: ../FL/Fl_Shared_Image.H sudoku.o: ../FL/Fl_Slider.H -sudoku.o: ../FL/Fl_String.H +sudoku.o: ../FL/Fl_String_class.H sudoku.o: ../FL/Fl_Sys_Menu_Bar.H sudoku.o: ../FL/fl_types.h sudoku.o: ../FL/fl_utf8.h @@ -2194,7 +2195,7 @@ table.o: ../FL/Fl_Scroll.H table.o: ../FL/Fl_Scrollbar.H table.o: ../FL/Fl_Simple_Terminal.H table.o: ../FL/Fl_Slider.H -table.o: ../FL/Fl_String.H +table.o: ../FL/Fl_String_class.H table.o: ../FL/Fl_Table.H table.o: ../FL/Fl_Table_Row.H table.o: ../FL/Fl_Text_Buffer.H @@ -2222,7 +2223,7 @@ tabs.o: ../FL/Fl_Image.H tabs.o: ../FL/Fl_Input.H tabs.o: ../FL/Fl_Input_.H tabs.o: ../FL/Fl_Return_Button.H -tabs.o: ../FL/Fl_String.H +tabs.o: ../FL/Fl_String_class.H tabs.o: ../FL/Fl_Tabs.H tabs.o: ../FL/fl_types.h tabs.o: ../FL/fl_utf8.h @@ -2247,7 +2248,7 @@ threads.o: ../FL/Fl_Group.H threads.o: ../FL/Fl_Image.H threads.o: ../FL/Fl_Scrollbar.H threads.o: ../FL/Fl_Slider.H -threads.o: ../FL/Fl_String.H +threads.o: ../FL/Fl_String_class.H threads.o: ../FL/fl_types.h threads.o: ../FL/fl_utf8.h threads.o: ../FL/Fl_Valuator.H @@ -2335,7 +2336,7 @@ tree.o: ../FL/Fl_RGB_Image.H tree.o: ../FL/Fl_Scrollbar.H tree.o: ../FL/Fl_Simple_Terminal.H tree.o: ../FL/Fl_Slider.H -tree.o: ../FL/Fl_String.H +tree.o: ../FL/Fl_String_class.H tree.o: ../FL/Fl_Text_Buffer.H tree.o: ../FL/Fl_Text_Display.H tree.o: ../FL/Fl_Tile.H -- cgit v1.2.3