X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Ffile-path.hh;h=1c039cf4ab0dd51efdcf0966d8edc424338b66ea;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=23997002328422f5cdebca12ed1efc65fdfdc397;hpb=d24e58ca5b51877dff138fad2383470707b51a0d;p=lilypond.git

diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index 2399700232..1c039cf4ab 100644
--- a/flower/include/file-path.hh
+++ b/flower/include/file-path.hh
@@ -1,15 +1,26 @@
 /*
-  file-path.hh -- declare File_path
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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 FILE_PATH_HH
 #define FILE_PATH_HH
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "std-string.hh"
 
 /**
@@ -23,19 +34,20 @@
 
 class File_path
 {
-  Array<Std_string> dirs_;
+  vector<string> dirs_;
+
 public:
-  Array<Std_string> directories () const;
-  Std_string find (Std_string name) const;
-  Std_string find (Std_string name, char const *extensions[]);
-  Std_string to_string () const;
-  bool try_append (Std_string str);
-  void append (Std_string str);
-  void parse_path (Std_string);
-  void prepend (Std_string str);
+  vector<string> directories () const;
+  string find (const string &name) const;
+  string find (const string &name, char const *extensions[]);
+  string to_string () const;
+  bool try_append (string str);
+  void append (const string&);
+  void parse_path (const string&);
+  void prepend (const string&);
 };
 
-bool is_file (Std_string file_name);
-bool is_dir (Std_string file_name);
+bool is_file (const string &file_name);
+bool is_dir (string file_name);
 
 #endif /* FILE_PATH */