From 75da739b4809664c1fac3c55ff345e0a7f6c68a3 Mon Sep 17 00:00:00 2001
From: Dan Eble <nine.fierce.ballads@gmail.com>
Date: Sat, 30 Oct 2021 11:04:36 -0400
Subject: [PATCH] String_convert: remove functions that C++11 offers

String_convert::dec2int    -> std::stoi
String_convert::int_string -> std::to_string
---
 flower/include/string-convert.hh |  2 --
 flower/string-convert.cc         | 28 ----------------------------
 lily/all-font-metrics.cc         |  4 +++-
 lily/general-scheme.cc           |  3 ++-
 lily/lilypond-version.cc         |  8 ++++----
 5 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index d8647e9e52..0fd9d68684 100644
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -23,11 +23,9 @@ public:
   static std::string be_u16 (uint16_t u);
   static std::string pad_to (const std::string &s, size_t length);
   static std::string bin2hex (Byte bin_char);
-  static int dec2int (const std::string &dec_string);
   static std::string form_string (char const *format, ...) __attribute__ ((format (printf, 1, 2)));
   static std::string vform_string (char const *format, va_list args);
   static std::string hex2bin (const std::string &str);
-  static std::string int_string (int i, char const *fmt = 0);
   static std::string to_lower (std::string s);
   static std::string to_upper (std::string s);
   static std::string percent_encode (std::string const &s);
diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 9137b25e0b..599125d33a 100644
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -60,19 +60,6 @@ String_convert::bin2hex (Byte bin_char)
   return str;
 }
 
-int
-String_convert::dec2int (const string &dec_string)
-{
-  if (!dec_string.length ())
-    return 0;
-
-  long l = 0;
-  if (!sscanf (dec_string.c_str (), "%ld", &l))
-    assert (false);
-
-  return (int)l;
-}
-
 int
 String_convert::hex2bin (string hex_string, string &bin_string_r)
 {
@@ -114,21 +101,6 @@ String_convert::hex2nibble (char byte)
   return -1;
 }
 
-/**
-   Convert an integer to a string
-
-   @param
-   #fmt# is a printf style format, default assumes "%d" as format.
-*/
-string
-String_convert::int_string (int i, char const *fmt)
-{
-  char buffer[STRING_BUFFER_LEN];
-  snprintf (buffer, STRING_BUFFER_LEN,
-            (fmt ? fmt : "%d"), i); // assume radix 10
-  return string (buffer);
-}
-
 string
 String_convert::form_string (char const *format, ...)
 {
diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index e87b22ad92..b78cb53675 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -26,6 +26,8 @@
 #include "scm-hash.hh"
 #include "warn.hh"
 
+#include <string>
+
 using std::string;
 
 Index_to_charcode_map const *
@@ -33,7 +35,7 @@ All_font_metrics::get_index_to_charcode_map (const string &filename,
                                              int face_index,
                                              FT_Face face)
 {
-  string key = filename + String_convert::int_string (face_index);
+  string key = filename + std::to_string (face_index);
   if (filename_charcode_maps_map_.find (key)
       == filename_charcode_maps_map_.end ())
     filename_charcode_maps_map_[key] = make_index_to_charcode_map (face);
diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index b50d2d161e..936c2c3faa 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -46,6 +46,7 @@
 #include <cstring> /* memset */
 #include <ctype.h>
 #include <glib.h>
+#include <string>
 
 using std::string;
 using std::vector;
@@ -453,7 +454,7 @@ string
 format_single_argument (SCM arg, int precision, bool escape = false)
 {
   if (scm_is_integer (arg) && scm_is_true (scm_exact_p (arg)))
-    return (String_convert::int_string (scm_to_int (arg)));
+    return std::to_string (scm_to_int (arg));
   else if (scm_is_number (arg))
     {
       Real val = scm_to_double (arg);
diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc
index e1166148a8..3076569b1a 100644
--- a/lily/lilypond-version.cc
+++ b/lily/lilypond-version.cc
@@ -19,10 +19,10 @@
 
 #include "lilypond-version.hh"
 #include "std-vector.hh"
-#include "string-convert.hh"
 #include "misc.hh"
 
 #include <ctype.h>
+#include <string>
 
 using std::string;
 using std::vector;
@@ -55,16 +55,16 @@ Lilypond_version::Lilypond_version (const string &str)
       if (version[2].find_first_not_of (digits) != string::npos
           || version[1].empty ())
         return;
-      patch_ = String_convert::dec2int (version[2]);
+      patch_ = std::stoi (version[2]);
     // fallthrough
     case 2:
       if (version[1].find_first_not_of (digits) != string::npos
           || version[1].empty () || version[0].empty ())
         return;
-      minor_ = String_convert::dec2int (version[1]);
+      minor_ = std::stoi (version[1]);
       if (version[0].find_first_not_of (digits) != string::npos)
         return;
-      major_ = String_convert::dec2int (version[0]);
+      major_ = std::stoi (version[0]);
     }
 }
 
-- 
GitLab