Issue 3513: removed unused code: functions that are declared but never defined and...

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index 148005672ec78698c41ba2bf856b41947e69e254..396eee2f912139cc85d467903bcdb7ac6c7e166f 100644 (file)
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -21,10 +21,8 @@ class String_convert
 public:
   static string pad_to (string s, size_t length);
   static string bool_string (bool b);
-  static string bin2dec (string bin_string);
   static string bin2hex (Byte bin_char);
   static string bin2hex (string bin_string);
-  static string dec2bin (string str);
   static int bin2int (string bin_string);
   static unsigned bin2unsigned (string bin_string);
   static string char_string (char c, int n);
@@ -33,8 +31,6 @@ public:
   static string double_string (double f, char const *fmt = 0);
   static string form_string (char const *format, ...) __attribute__ ((format (printf, 1, 2)));
   static string vform_string (char const *format, va_list args);
-  static int hex2int (string str);
-  static unsigned hex2unsigned (string str);
   static string hex2bin (string str);
   static string int_string (int i, char const *fmt = 0);
   static string unsigned_string (unsigned);
@@ -46,7 +42,6 @@ public:
   static string rational_string (Rational);
   static string pointer_string (void const *);
   static string precision_string (double x, int n);
-  //  static vector<string> split (string str, char c);
   static string i64_string (I64, char const *fmt = 0);
   static string to_lower (string s);
   static string to_upper (string s);

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index c2abb8cd85b05a7df84a85ad66bb1f595303a992..cf217be3b08efbb2baa9e5b949d361f9c38f00a6 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -33,7 +33,6 @@ class Bar_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Bar_engraver);
-  void request_bar (string type_string);
 
 protected:
   void stop_translation_timestep ();

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index 9c9b97b580e432086e7d1eb79b6f9b7afbcdd482..f58563cbbbd1b4b80986abd678f96933979b1e0f 100644 (file)
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -36,7 +36,6 @@ public:
   DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
 
   DECLARE_GROB_INTERFACE ();
-  static string get_fontcharname (string style, int alteration);
   static SCM get_stencil (Grob *me);
 };
 

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 4743e42b609ed794c255697c29a303d2f75599af..70a77fd6854b38562ee5d42828df5987c79e9c21 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -66,8 +66,6 @@ protected:
   Font_metric ();
 };
 
-int get_encoded_index (Font_metric *m, string input_coding, int code);
-
 DECLARE_UNSMOB (Font_metric, metrics);
 
 char *pfb2pfa (Byte const *pfb, int length);

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 19b01ca6ff3b67dc3cb7ac0308a3d2b4152818a9..c12fcedd5dc57903fcca9412bb262ebe729938c2 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -38,7 +38,6 @@ class Lily_lexer : public Includable_lexer
 private:
   int lookup_keyword (string);
   int scan_bare_word (string);
-  SCM scan_markup_word (string);
   int scan_escaped_word (string);
   int scan_shorthand (string);
   int scan_scm_id (SCM);

diff --git a/lily/include/main.hh b/lily/include/main.hh
index e9113b4e087630a241c3337640f78541b8e954b2..06a1a0999116464203448bc5987c14bcf8890217 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -28,8 +28,6 @@ void set_debug (bool);
 void do_scores ();
 void clear_scores ();
 void add_score (Score *s);
-void set_default_output (string s);
-string find_file (string);
 void call_constructors ();
 vector<string> get_inclusion_names ();
 void set_inclusion_names (vector<string>);

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index e3789d0685944c4cace45635f1d571e9e5315dbe..00ca9addb94cdef67ffe1773c2b9ef3bffc15077 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -57,7 +57,6 @@ public:
   Box get_indexed_char_dimensions (size_t) const;
   Box get_unscaled_indexed_char_dimensions (size_t) const;
   size_t name_to_index (string) const;
-  //size_t glyph_name_to_charcode (string) const;
   size_t index_to_charcode (size_t) const;
   void derived_mark () const;
   SCM sub_fonts () const;

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index ef1b1b7a224d99b2f35232ae19bc08012051f6d0..90500a9f6fe838ab509057a49143f3795cd84c25 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -51,7 +51,6 @@ public:
   SCM scheme_to_string (SCM);
 };
 
-Paper_outputter *get_paper_outputter (string, string);
 DECLARE_UNSMOB (Paper_outputter, outputter);
 
 #endif /* PAPER_OUTPUTTER_HH */

diff --git a/lily/include/stream.hh b/lily/include/stream.hh
deleted file mode 100644 (file)
index 000ec16..0000000
--- a/lily/include/stream.hh
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-  This file is part of LilyPond, the GNU music typesetter.
-
-  Copyright (C) 2001--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
-  LilyPond is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  LilyPond is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef STREAM_HH
-#define STREAM_HH
-
-#include "std-string.hh"
-
-#include <iostream>
-#include <sstream>
-using namespace std;
-
-#if __GNUC__ > 2
-ostream *open_file_stream (string file_name,
-                           ios_base::openmode mode = ios::out);
-#else
-ostream *open_file_stream (string file_name, int mode = ios::out);
-#endif
-void close_file_stream (ostream *os);
-
-#endif /* STREAM_HH */
-

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 9409762d66f0bbf2eb9b1514336569c677e5ce05..2d9429c76753c98a8b31bd4161eaa67947b142e7 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -27,7 +27,6 @@ using namespace std;
 #include "midi-chunk.hh"
 #include "misc.hh"
 #include "program-option.hh"
-#include "stream.hh"
 #include "string-convert.hh"
 #include "warn.hh"