C++11 tidying.

[dcpomatic.git] / src / lib / image_filename_sorter.h

diff --git a/src/lib/image_filename_sorter.h b/src/lib/image_filename_sorter.h
index 67843109ed3562a8d718f3369193da2f4748a3f8..960b1d8a70253e6b596056431d1c51b9ba39d083 100644 (file)
--- a/src/lib/image_filename_sorter.h
+++ b/src/lib/image_filename_sorter.h
@@ -1,23 +1,25 @@
 /*
     Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic 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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 
 class ImageFilenameSorter
 {
@@ -25,5 +27,5 @@ public:
        bool operator() (boost::filesystem::path a, boost::filesystem::path b);
 
 private:
-       std::list<int> extract_numbers (boost::filesystem::path p);
+       std::string extract_numbers (boost::filesystem::path p);
 };