Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / lily / lilypond-version.cc

diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc
index da44cba73b1b11b998869e6c38ac8c7068981fd2..aa192a30c77dc3415368fee9e9109609aa95e312 100644 (file)
--- a/lily/lilypond-version.cc
+++ b/lily/lilypond-version.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <ctype.h>
 
-#include "lilypond-input-version.hh"
+#include "lilypond-version.hh"
 #include "string-convert.hh"
-#include "array.hh"
+#include "misc.hh"
 
 Lilypond_version::Lilypond_version (int major, int minor, int patch)
 {
@@ -19,14 +19,14 @@ Lilypond_version::Lilypond_version (int major, int minor, int patch)
   patch_ = patch;
 }
 
-Lilypond_version::Lilypond_version (String str)
+Lilypond_version::Lilypond_version (string str)
 {
   major_ = 0; 
   minor_ = 0;
   patch_ = 0;
   
-  Array<Std_string> version;
-  version = String_convert::split (str, '.');
+  vector<string> version;
+  version = string_split (str, '.');
 
   if (version.size () > 0 && isdigit (version[0][0]))
     major_ = String_convert::dec2int (version[0]);
@@ -42,10 +42,12 @@ Lilypond_version::Lilypond_version (String str)
     extra_patch_string_ = version[3];
 }
 
-String
+string
 Lilypond_version::to_string () const
 {
-  return ::to_string (major_) + "." + ::to_string (minor_) + "." + ::to_string (patch_);
+  return ::to_string (major_)
+    + "." + ::to_string (minor_)
+    + "." + ::to_string (patch_);
 }
 
 Lilypond_version::operator int () const