From: Frédéric Bron Date: Fri, 23 Aug 2013 15:44:26 +0000 (+0200) Subject: Issue 3513: removed unused code: functions that are declared but never defined and... X-Git-Tag: release/2.17.26-1~14 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=999595939c26d7f060ca73c6fd537248962942e0;p=lilypond.git Issue 3513: removed unused code: functions that are declared but never defined and stream.hh --- diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh index 148005672e..396eee2f91 100644 --- 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 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 c2abb8cd85..cf217be3b0 100644 --- 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 9c9b97b580..f58563cbbb 100644 --- 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 4743e42b60..70a77fd685 100644 --- 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 19b01ca6ff..c12fcedd5d 100644 --- 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 e9113b4e08..06a1a09991 100644 --- 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 get_inclusion_names (); void set_inclusion_names (vector); diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh index e3789d0685..00ca9addb9 100644 --- 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 ef1b1b7a22..90500a9f6f 100644 --- 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 index 000ec16f1c..0000000000 --- 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 - - 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 . -*/ - -#ifndef STREAM_HH -#define STREAM_HH - -#include "std-string.hh" - -#include -#include -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 9409762d66..2d9429c767 100644 --- 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"