[master] 788ca20 - Rename FL/Fl_String_class.H to FL/Fl_String.H

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 788ca20 - Rename FL/Fl_String_class.H to FL/Fl_String.H "Albrecht Schlosser" 11:17 Jan 16 top right image
 
commit 788ca208f7e633cd19ddfa0151edc74f3d1a5438
Author:     Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sun Jan 16 19:25:10 2022 +0100
Commit:     Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sun Jan 16 19:47:16 2022 +0100

    Rename FL/Fl_String_class.H to FL/Fl_String.H
    
    This is part 2 of the final fix for a previous name clash on case
    insensitive file systems (fl_string.h vs. Fl_String.H).

 FL/Fl_String.H          | 114 ++++++++++++++++++++++++++++++++++
 FL/Fl_String_class.H    | 114 ----------------------------------
 FL/fl_ask.H             |   2 +-
 fluid/makedepend        |  24 ++++----
 src/CMakeLists.txt      |   2 +-
 src/Fl_String.cxx       | 159 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/Fl_String_class.cxx | 159 ------------------------------------------------
 src/Makefile            |   2 +-
 src/makedepend          |  50 +++++++--------
 test/makedepend         |  50 +++++++--------
 10 files changed, 338 insertions(+), 338 deletions(-)

diff --git FL/Fl_String.H FL/Fl_String.H
new file mode 100644
index 0000000..8b9b33a
--- /dev/null
+++ FL/Fl_String.H
@@ -0,0 +1,114 @@
+//
+// Basic Fl_String header for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 2021-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
+// 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 FL/Fl_String_class.H FL/Fl_String_class.H
deleted file mode 100644
index 938e0d6..0000000
--- FL/Fl_String_class.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_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 FL/fl_ask.H FL/fl_ask.H
index 7df49a8..4498013 100644
--- FL/fl_ask.H
+++ FL/fl_ask.H
@@ -22,7 +22,7 @@
 #define _FL_fl_ask_H_
 
 #include <FL/Enumerations.H>
-#include <FL/Fl_String_class.H>
+#include <FL/Fl_String.H>
 #include <FL/fl_attr.h>
 
 class Fl_Widget;
diff --git fluid/makedepend fluid/makedepend
index ad6d185..5789faa 100644
--- fluid/makedepend
+++ fluid/makedepend
@@ -61,7 +61,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_class.H
+alignment_panel.o: ../FL/Fl_String.H
 alignment_panel.o: ../FL/Fl_Tabs.H
 alignment_panel.o: ../FL/Fl_Text_Buffer.H
 alignment_panel.o: ../FL/Fl_Text_Display.H
@@ -217,7 +217,7 @@ 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_class.H
+ExternalCodeEditor_UNIX.o: ../FL/Fl_String.H
 ExternalCodeEditor_UNIX.o: ../FL/fl_string_functions.h
 ExternalCodeEditor_UNIX.o: ../FL/fl_types.h
 ExternalCodeEditor_UNIX.o: ../FL/fl_utf8.h
@@ -339,7 +339,7 @@ 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_class.H
+file.o: ../FL/Fl_String.H
 file.o: ../FL/fl_string_functions.h
 file.o: ../FL/Fl_Tabs.H
 file.o: ../FL/Fl_Text_Buffer.H
@@ -421,7 +421,7 @@ 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_class.H
+fluid.o: ../FL/Fl_String.H
 fluid.o: ../FL/fl_string_functions.h
 fluid.o: ../FL/Fl_Tabs.H
 fluid.o: ../FL/Fl_Text_Buffer.H
@@ -500,7 +500,7 @@ 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_class.H
+Fluid_Image.o: ../FL/Fl_String.H
 Fluid_Image.o: ../FL/fl_string_functions.h
 Fluid_Image.o: ../FL/Fl_Tabs.H
 Fluid_Image.o: ../FL/Fl_Tile.H
@@ -563,7 +563,7 @@ 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_class.H
+Fl_Function_Type.o: ../FL/Fl_String.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
@@ -621,7 +621,7 @@ Fl_Group_Type.o: ../FL/Fl_RGB_Image.H
 Fl_Group_Type.o: ../FL/Fl_Scroll.H
 Fl_Group_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Group_Type.o: ../FL/Fl_Slider.H
-Fl_Group_Type.o: ../FL/Fl_String_class.H
+Fl_Group_Type.o: ../FL/Fl_String.H
 Fl_Group_Type.o: ../FL/Fl_Table.H
 Fl_Group_Type.o: ../FL/Fl_Tabs.H
 Fl_Group_Type.o: ../FL/fl_types.h
@@ -685,7 +685,7 @@ Fl_Menu_Type.o: ../FL/Fl_Shared_Image.H
 Fl_Menu_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Menu_Type.o: ../FL/Fl_Slider.H
 Fl_Menu_Type.o: ../FL/Fl_Spinner.H
-Fl_Menu_Type.o: ../FL/Fl_String_class.H
+Fl_Menu_Type.o: ../FL/Fl_String.H
 Fl_Menu_Type.o: ../FL/Fl_Tabs.H
 Fl_Menu_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Menu_Type.o: ../FL/Fl_Text_Display.H
@@ -808,7 +808,7 @@ Fl_Widget_Type.o: ../FL/fl_show_colormap.H
 Fl_Widget_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Widget_Type.o: ../FL/Fl_Slider.H
 Fl_Widget_Type.o: ../FL/Fl_Spinner.H
-Fl_Widget_Type.o: ../FL/Fl_String_class.H
+Fl_Widget_Type.o: ../FL/Fl_String.H
 Fl_Widget_Type.o: ../FL/Fl_Table.H
 Fl_Widget_Type.o: ../FL/Fl_Tabs.H
 Fl_Widget_Type.o: ../FL/Fl_Text_Buffer.H
@@ -885,7 +885,7 @@ Fl_Window_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Window_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Window_Type.o: ../FL/Fl_Slider.H
 Fl_Window_Type.o: ../FL/Fl_Spinner.H
-Fl_Window_Type.o: ../FL/Fl_String_class.H
+Fl_Window_Type.o: ../FL/Fl_String.H
 Fl_Window_Type.o: ../FL/Fl_Tabs.H
 Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Window_Type.o: ../FL/Fl_Text_Display.H
@@ -1071,7 +1071,7 @@ 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_class.H
+shell_command.o: ../FL/Fl_String.H
 shell_command.o: ../FL/fl_string_functions.h
 shell_command.o: ../FL/Fl_Tabs.H
 shell_command.o: ../FL/Fl_Text_Buffer.H
@@ -1169,7 +1169,7 @@ 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_class.H
+template_panel.o: ../FL/Fl_String.H
 template_panel.o: ../FL/fl_string_functions.h
 template_panel.o: ../FL/fl_types.h
 template_panel.o: ../FL/fl_utf8.h
diff --git src/CMakeLists.txt src/CMakeLists.txt
index d11dc1f..17c6479 100644
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -79,7 +79,7 @@ set (CPPFILES
   Fl_Single_Window.cxx
   Fl_Slider.cxx
   Fl_Spinner.cxx
-  Fl_String_class.cxx
+  Fl_String.cxx
   Fl_Sys_Menu_Bar.cxx
   Fl_System_Driver.cxx
   Fl_Table.cxx
diff --git src/Fl_String.cxx src/Fl_String.cxx
new file mode 100644
index 0000000..f53a2da
--- /dev/null
+++ src/Fl_String.cxx
@@ -0,0 +1,159 @@
+//
+// Basic Fl_String class for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 2021-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
+// 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
+//
+
+#include <FL/Fl_String.H>
+
+#include <stdio.h>
+#include <string.h>
+
+/** \file src/Fl_String.cxx
+  Basic Fl_String class for FLTK.
+*/
+
+static int string_count;
+
+Fl_String::Fl_String() {
+  string_count++;
+  init();
+  // debug("created ()");
+}
+
+Fl_String::Fl_String(const char *str) {
+  string_count++;
+  init();
+  value(str);
+  // debug("created (str)");
+}
+
+Fl_String::Fl_String(const char *str, int size) {
+  string_count++;
+  init();
+  value(str, size);
+  // debug("created (str, size)");
+}
+
+void Fl_String::init() {
+  size_ = 0;
+  value_ = 0;
+  capacity_ = 0;
+}
+
+// copy constructor
+Fl_String::Fl_String(const Fl_String &in) {
+  string_count++;
+  init();
+  value(in.value(), in.size());
+  // debug("copied (c'tor)");
+}
+
+// copy assignment operator
+Fl_String& Fl_String::operator=(const Fl_String &in) {
+  if (this == &in)
+    return *this;
+  value(in.value(), in.size());
+  // debug("copy assigned");
+  return *this;
+}
+
+// assignment operator for 'const char *'
+Fl_String& Fl_String::operator=(const char *in) {
+  value(in);
+  // debug("*STRING* assigned");
+  return *this;
+}
+
+Fl_String::~Fl_String() {
+  string_count--;
+  // debug("~Fl_String()");
+  delete[] value_;
+}
+
+void Fl_String::alloc_buf(int size) {
+  if (size < 0)
+    return;
+  if (size > 0 && size <= capacity_)
+    return;
+  if (capacity_ > 0)
+    return;
+
+  int new_size = (size + 1 + 15) & (~15); // round upwards
+  char *new_value = new char[new_size];
+  capacity_ = new_size - 1;
+
+  size_ = 0;
+  delete[] value_;
+  value_ = new_value;
+}
+
+void Fl_String::value(const char *str) {
+  value(str, str ? (int)strlen(str) : 0);
+}
+
+int Fl_String::slen() const {
+  if (!value_) return 0;
+  return (int)strlen(value_);
+}
+
+void Fl_String::value(const char *str, int len) {
+  if (str) {
+    alloc_buf(len);
+    size_ = len;
+    memcpy(value_, str, size_);
+    value_[size_] = '\0';
+  } else {            // str == NULL
+    size_ = 0;        // ignore len !
+    delete[] value_;  // free buffer
+    value_ = NULL;    // set null pointer (!)
+    capacity_ = 0;    // reset capacity
+  }
+}
+
+int Fl_String::capacity() const {
+  return capacity_; // > 0 ? capacity_ - 1 : capacity_;
+}
+
+void Fl_String::release() {
+  delete[] value_;
+  value_ = 0;
+  size_ = 0;
+  capacity_ = 0;
+}
+
+// =============================  DEBUG  =============================
+
+static const char fl_string_debug = 0;
+
+void Fl_String::debug(const char *info) const {
+  if (fl_string_debug) {
+    printf("Fl_String[%2d] '%-20s': %p, value = %p (%d/%d): '%s'.\n",
+          string_count, info, this, value_, size_, capacity_, value_);
+  }
+}
+
+void Fl_String::hexdump(const char *info) const {
+  if (fl_string_debug) {
+    debug(info);
+    for (int i = 0; i < size_; i++) {
+      if ((i & 15) == 0) {
+        if (i > 0) printf("\n");
+        printf("  [%04x %4d] ", i, i);
+      } else if ((i & 3) == 0)
+        printf(" ");
+      printf(" %02x", (unsigned char)value_[i]);
+    }
+    printf("\n");
+  }
+}
diff --git src/Fl_String_class.cxx src/Fl_String_class.cxx
deleted file mode 100644
index 0293f43..0000000
--- src/Fl_String_class.cxx
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Basic Fl_String class 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
-//
-
-#include <FL/Fl_String_class.H>
-
-#include <stdio.h>
-#include <string.h>
-
-/** \file src/Fl_String_class.cxx
-  Basic Fl_String class for FLTK.
-*/
-
-static int string_count;
-
-Fl_String::Fl_String() {
-  string_count++;
-  init();
-  // debug("created ()");
-}
-
-Fl_String::Fl_String(const char *str) {
-  string_count++;
-  init();
-  value(str);
-  // debug("created (str)");
-}
-
-Fl_String::Fl_String(const char *str, int size) {
-  string_count++;
-  init();
-  value(str, size);
-  // debug("created (str, size)");
-}
-
-void Fl_String::init() {
-  size_ = 0;
-  value_ = 0;
-  capacity_ = 0;
-}
-
-// copy constructor
-Fl_String::Fl_String(const Fl_String &in) {
-  string_count++;
-  init();
-  value(in.value(), in.size());
-  // debug("copied (c'tor)");
-}
-
-// copy assignment operator
-Fl_String& Fl_String::operator=(const Fl_String &in) {
-  if (this == &in)
-    return *this;
-  value(in.value(), in.size());
-  // debug("copy assigned");
-  return *this;
-}
-
-// assignment operator for 'const char *'
-Fl_String& Fl_String::operator=(const char *in) {
-  value(in);
-  // debug("*STRING* assigned");
-  return *this;
-}
-
-Fl_String::~Fl_String() {
-  string_count--;
-  // debug("~Fl_String()");
-  delete[] value_;
-}
-
-void Fl_String::alloc_buf(int size) {
-  if (size < 0)
-    return;
-  if (size > 0 && size <= capacity_)
-    return;
-  if (capacity_ > 0)
-    return;
-
-  int new_size = (size + 1 + 15) & (~15); // round upwards
-  char *new_value = new char[new_size];
-  capacity_ = new_size - 1;
-
-  size_ = 0;
-  delete[] value_;
-  value_ = new_value;
-}
-
-void Fl_String::value(const char *str) {
-  value(str, str ? (int)strlen(str) : 0);
-}
-
-int Fl_String::slen() const {
-  if (!value_) return 0;
-  return (int)strlen(value_);
-}
-
-void Fl_String::value(const char *str, int len) {
-  if (str) {
-    alloc_buf(len);
-    size_ = len;
-    memcpy(value_, str, size_);
-    value_[size_] = '\0';
-  } else {            // str == NULL
-    size_ = 0;        // ignore len !
-    delete[] value_;  // free buffer
-    value_ = NULL;    // set null pointer (!)
-    capacity_ = 0;    // reset capacity
-  }
-}
-
-int Fl_String::capacity() const {
-  return capacity_; // > 0 ? capacity_ - 1 : capacity_;
-}
-
-void Fl_String::release() {
-  delete[] value_;
-  value_ = 0;
-  size_ = 0;
-  capacity_ = 0;
-}
-
-// =============================  DEBUG  =============================
-
-static const char fl_string_debug = 0;
-
-void Fl_String::debug(const char *info) const {
-  if (fl_string_debug) {
-    printf("Fl_String[%2d] '%-20s': %p, value = %p (%d/%d): '%s'.\n",
-          string_count, info, this, value_, size_, capacity_, value_);
-  }
-}
-
-void Fl_String::hexdump(const char *info) const {
-  if (fl_string_debug) {
-    debug(info);
-    for (int i = 0; i < size_; i++) {
-      if ((i & 15) == 0) {
-        if (i > 0) printf("\n");
-        printf("  [%04x %4d] ", i, i);
-      } else if ((i & 3) == 0)
-        printf(" ");
-      printf(" %02x", (unsigned char)value_[i]);
-    }
-    printf("\n");
-  }
-}
diff --git src/Makefile src/Makefile
index 6c0b1e6..6df9160 100644
--- src/Makefile
+++ src/Makefile
@@ -81,7 +81,7 @@ CPPFILES = \
 	Fl_Single_Window.cxx \
 	Fl_Slider.cxx \
 	Fl_Spinner.cxx \
-	Fl_String_class.cxx \
+	Fl_String.cxx \
 	Fl_Sys_Menu_Bar.cxx \
 	Fl_System_Driver.cxx \
 	Fl_Table.cxx \
diff --git src/makedepend src/makedepend
index 75ab4c5..c0895df 100644
--- src/makedepend
+++ src/makedepend
@@ -215,7 +215,7 @@ 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_class.H
+drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_String.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_string_functions.h
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_types.h
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_utf8.h
@@ -284,7 +284,7 @@ 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_class.H
+drivers/PostScript/Fl_PostScript.o: ../FL/Fl_String.H
 drivers/PostScript/Fl_PostScript.o: ../FL/fl_string_functions.h
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Tile.H
 drivers/PostScript/Fl_PostScript.o: ../FL/fl_types.h
@@ -415,7 +415,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_class.H
+drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_String.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
@@ -486,7 +486,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_class.H
+drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_String.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
@@ -987,7 +987,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_class.H
+fl_ask.o: ../FL/Fl_String.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
@@ -1588,7 +1588,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_class.H
+Fl_File_Chooser.o: ../FL/Fl_String.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
@@ -1627,7 +1627,7 @@ 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_class.H
+Fl_File_Chooser2.o: ../FL/Fl_String.H
 Fl_File_Chooser2.o: ../FL/fl_string_functions.h
 Fl_File_Chooser2.o: ../FL/Fl_Tile.H
 Fl_File_Chooser2.o: ../FL/fl_types.h
@@ -1669,7 +1669,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_class.H
+fl_file_dir.o: ../FL/Fl_String.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
@@ -2010,7 +2010,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_class.H
+Fl_Help_Dialog.o: ../FL/Fl_String.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
@@ -2140,7 +2140,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_class.H
+Fl_Input.o: ../FL/Fl_String.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
@@ -2178,7 +2178,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_class.H
+Fl_Input_.o: ../FL/Fl_String.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
@@ -2395,7 +2395,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_class.H
+Fl_Message.o: ../FL/Fl_String.H
 Fl_Message.o: ../FL/fl_string_functions.h
 Fl_Message.o: ../FL/fl_types.h
 Fl_Message.o: ../FL/fl_utf8.h
@@ -2447,7 +2447,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_class.H
+Fl_Native_File_Chooser.o: ../FL/Fl_String.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
@@ -2484,7 +2484,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_class.H
+Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_String.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
@@ -2536,7 +2536,7 @@ Fl_Native_File_Chooser_GTK.o: ../FL/Fl_RGB_Image.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Scrollbar.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Shared_Image.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Slider.H
-Fl_Native_File_Chooser_GTK.o: ../FL/Fl_String_class.H
+Fl_Native_File_Chooser_GTK.o: ../FL/Fl_String.H
 Fl_Native_File_Chooser_GTK.o: ../FL/fl_string_functions.h
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Text_Buffer.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Text_Display.H
@@ -2590,7 +2590,7 @@ Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Native_File_Chooser.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Overlay_Window.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Preferences.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Return_Button.H
-Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_String_class.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_String.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Tile.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_types.h
 Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_utf8.h
@@ -3198,12 +3198,12 @@ fl_string.o: ../FL/fl_casts.H
 fl_string.o: ../FL/fl_config.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_functions.h
 fl_string.o: ../FL/fl_types.h
 fl_string.o: ../FL/fl_utf8.h
 fl_string.o: ../FL/platform_types.h
 fl_string.o: Fl_System_Driver.H
-Fl_String_class.o: ../FL/Fl_String_class.H
 Fl_SVG_Image.o: ../config.h
 Fl_SVG_Image.o: ../FL/Enumerations.H
 Fl_SVG_Image.o: ../FL/Fl.H
@@ -3345,7 +3345,7 @@ Fl_Text_Buffer.o: ../FL/Fl_Cairo.H
 Fl_Text_Buffer.o: ../FL/fl_casts.H
 Fl_Text_Buffer.o: ../FL/fl_config.h
 Fl_Text_Buffer.o: ../FL/Fl_Export.H
-Fl_Text_Buffer.o: ../FL/Fl_String_class.H
+Fl_Text_Buffer.o: ../FL/Fl_String.H
 Fl_Text_Buffer.o: ../FL/fl_string_functions.h
 Fl_Text_Buffer.o: ../FL/Fl_Text_Buffer.H
 Fl_Text_Buffer.o: ../FL/fl_types.h
@@ -3408,7 +3408,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_class.H
+Fl_Text_Editor.o: ../FL/Fl_String.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
@@ -3873,7 +3873,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_class.H
+Fl_x.o: ../FL/Fl_String.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
@@ -3974,7 +3974,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_class.H
+forms_bitmap.o: ../FL/Fl_String.H
 forms_bitmap.o: ../FL/Fl_Tile.H
 forms_bitmap.o: ../FL/Fl_Timer.H
 forms_bitmap.o: ../FL/fl_types.h
@@ -4034,7 +4034,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_class.H
+forms_compatibility.o: ../FL/Fl_String.H
 forms_compatibility.o: ../FL/Fl_Tile.H
 forms_compatibility.o: ../FL/Fl_Timer.H
 forms_compatibility.o: ../FL/fl_types.h
@@ -4105,7 +4105,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_class.H
+forms_fselect.o: ../FL/Fl_String.H
 forms_fselect.o: ../FL/Fl_Tile.H
 forms_fselect.o: ../FL/Fl_Timer.H
 forms_fselect.o: ../FL/fl_types.h
@@ -4165,7 +4165,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_class.H
+forms_pixmap.o: ../FL/Fl_String.H
 forms_pixmap.o: ../FL/Fl_Tile.H
 forms_pixmap.o: ../FL/Fl_Timer.H
 forms_pixmap.o: ../FL/fl_types.h
@@ -4224,7 +4224,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_class.H
+forms_timer.o: ../FL/Fl_String.H
 forms_timer.o: ../FL/Fl_Tile.H
 forms_timer.o: ../FL/Fl_Timer.H
 forms_timer.o: ../FL/fl_types.h
diff --git test/makedepend test/makedepend
index f5d2708..6fc9d44 100644
--- test/makedepend
+++ test/makedepend
@@ -88,7 +88,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_class.H
+ask.o: ../FL/Fl_String.H
 ask.o: ../FL/fl_types.h
 ask.o: ../FL/fl_utf8.h
 ask.o: ../FL/Fl_Widget.H
@@ -214,7 +214,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_class.H
+browser.o: ../FL/Fl_String.H
 browser.o: ../FL/Fl_Text_Buffer.H
 browser.o: ../FL/Fl_Text_Display.H
 browser.o: ../FL/fl_types.h
@@ -235,7 +235,7 @@ button.o: ../FL/fl_config.h
 button.o: ../FL/Fl_Export.H
 button.o: ../FL/Fl_Group.H
 button.o: ../FL/Fl_Image.H
-button.o: ../FL/Fl_String_class.H
+button.o: ../FL/Fl_String.H
 button.o: ../FL/fl_types.h
 button.o: ../FL/fl_utf8.h
 button.o: ../FL/Fl_Widget.H
@@ -314,7 +314,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_class.H
+checkers.o: ../FL/Fl_String.H
 checkers.o: ../FL/fl_types.h
 checkers.o: ../FL/fl_utf8.h
 checkers.o: ../FL/Fl_Valuator.H
@@ -366,7 +366,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_class.H
+clipboard.o: ../FL/Fl_String.H
 clipboard.o: ../FL/Fl_Tabs.H
 clipboard.o: ../FL/Fl_Text_Buffer.H
 clipboard.o: ../FL/Fl_Text_Display.H
@@ -414,7 +414,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_class.H
+colbrowser.o: ../FL/Fl_String.H
 colbrowser.o: ../FL/fl_types.h
 colbrowser.o: ../FL/fl_utf8.h
 colbrowser.o: ../FL/Fl_Valuator.H
@@ -626,7 +626,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_class.H
+demo.o: ../FL/Fl_String.H
 demo.o: ../FL/Fl_Text_Buffer.H
 demo.o: ../FL/Fl_Text_Display.H
 demo.o: ../FL/fl_types.h
@@ -687,7 +687,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_class.H
+device.o: ../FL/Fl_String.H
 device.o: ../FL/Fl_SVG_File_Surface.H
 device.o: ../FL/Fl_Tile.H
 device.o: ../FL/fl_types.h
@@ -770,7 +770,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_class.H
+editor.o: ../FL/Fl_String.H
 editor.o: ../FL/Fl_Text_Buffer.H
 editor.o: ../FL/Fl_Text_Display.H
 editor.o: ../FL/Fl_Text_Editor.H
@@ -845,7 +845,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_class.H
+file_chooser.o: ../FL/Fl_String.H
 file_chooser.o: ../FL/Fl_Text_Buffer.H
 file_chooser.o: ../FL/Fl_Text_Display.H
 file_chooser.o: ../FL/Fl_Tile.H
@@ -867,7 +867,7 @@ fltk-versions.o: ../FL/fl_config.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_class.H
+fltk-versions.o: ../FL/Fl_String.H
 fltk-versions.o: ../FL/fl_types.h
 fltk-versions.o: ../FL/fl_utf8.h
 fltk-versions.o: ../FL/Fl_Widget.H
@@ -914,7 +914,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_class.H
+fonts.o: ../FL/Fl_String.H
 fonts.o: ../FL/Fl_Tile.H
 fonts.o: ../FL/fl_types.h
 fonts.o: ../FL/fl_utf8.h
@@ -972,7 +972,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_class.H
+forms.o: ../FL/Fl_String.H
 forms.o: ../FL/Fl_Tile.H
 forms.o: ../FL/Fl_Timer.H
 forms.o: ../FL/fl_types.h
@@ -1051,7 +1051,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_class.H
+fullscreen.o: ../FL/Fl_String.H
 fullscreen.o: ../FL/Fl_Toggle_Light_Button.H
 fullscreen.o: ../FL/fl_types.h
 fullscreen.o: ../FL/fl_utf8.h
@@ -1486,7 +1486,7 @@ 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_class.H
+menubar.o: ../FL/Fl_String.H
 menubar.o: ../FL/fl_string_functions.h
 menubar.o: ../FL/Fl_Sys_Menu_Bar.H
 menubar.o: ../FL/Fl_Text_Buffer.H
@@ -1510,7 +1510,7 @@ message.o: ../FL/fl_config.h
 message.o: ../FL/Fl_Export.H
 message.o: ../FL/Fl_Group.H
 message.o: ../FL/Fl_Image.H
-message.o: ../FL/Fl_String_class.H
+message.o: ../FL/Fl_String.H
 message.o: ../FL/fl_types.h
 message.o: ../FL/fl_utf8.h
 message.o: ../FL/Fl_Widget.H
@@ -1580,7 +1580,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_class.H
+native-filechooser.o: ../FL/Fl_String.H
 native-filechooser.o: ../FL/Fl_Text_Buffer.H
 native-filechooser.o: ../FL/Fl_Text_Display.H
 native-filechooser.o: ../FL/Fl_Tile.H
@@ -1777,7 +1777,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_class.H
+pixmap_browser.o: ../FL/Fl_String.H
 pixmap_browser.o: ../FL/Fl_SVG_File_Surface.H
 pixmap_browser.o: ../FL/Fl_Tile.H
 pixmap_browser.o: ../FL/fl_types.h
@@ -1813,7 +1813,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_class.H
+preferences.o: ../FL/Fl_String.H
 preferences.o: ../FL/fl_types.h
 preferences.o: ../FL/fl_utf8.h
 preferences.o: ../FL/Fl_Valuator.H
@@ -2061,7 +2061,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_class.H
+resizebox.o: ../FL/Fl_String.H
 resizebox.o: ../FL/fl_types.h
 resizebox.o: ../FL/fl_utf8.h
 resizebox.o: ../FL/Fl_Widget.H
@@ -2213,7 +2213,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_class.H
+sudoku.o: ../FL/Fl_String.H
 sudoku.o: ../FL/Fl_Sys_Menu_Bar.H
 sudoku.o: ../FL/fl_types.h
 sudoku.o: ../FL/fl_utf8.h
@@ -2284,7 +2284,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_class.H
+table.o: ../FL/Fl_String.H
 table.o: ../FL/Fl_Table.H
 table.o: ../FL/Fl_Table_Row.H
 table.o: ../FL/Fl_Text_Buffer.H
@@ -2313,7 +2313,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_class.H
+tabs.o: ../FL/Fl_String.H
 tabs.o: ../FL/Fl_Tabs.H
 tabs.o: ../FL/fl_types.h
 tabs.o: ../FL/fl_utf8.h
@@ -2339,7 +2339,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_class.H
+threads.o: ../FL/Fl_String.H
 threads.o: ../FL/fl_types.h
 threads.o: ../FL/fl_utf8.h
 threads.o: ../FL/Fl_Valuator.H
@@ -2431,7 +2431,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_class.H
+tree.o: ../FL/Fl_String.H
 tree.o: ../FL/Fl_Text_Buffer.H
 tree.o: ../FL/Fl_Text_Display.H
 tree.o: ../FL/Fl_Tile.H
Direct Link to Message ]
 
bottom left image   bottom right image
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2022 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.