[Boost-commit] svn:boost r70973 - trunk/tools/quickbook/src

Subject: [Boost-commit] svn:boost r70973 - trunk/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-04-04 15:31:38

Author: danieljames
Date: 2011-04-04 15:31:38 EDT (Mon, 04 Apr 2011)
New Revision: 70973
URL: http://svn.boost.org/trac/boost/changeset/70973

Log:
Quickbook: Fix a few places where strings are used for filenames.
Text files modified: 
   trunk/tools/quickbook/src/actions.cpp      |     4 ++--                                    
   trunk/tools/quickbook/src/actions.hpp      |     3 ++-                                     
   trunk/tools/quickbook/src/code_snippet.cpp |     4 ++--                                    
   3 files changed, 6 insertions(+), 5 deletions(-)

Modified: trunk/tools/quickbook/src/actions.cpp
==============================================================================
--- trunk/tools/quickbook/src/actions.cpp	(original)
+++ trunk/tools/quickbook/src/actions.cpp	2011-04-04 15:31:38 EDT (Mon, 04 Apr 2011)
@@ -1777,7 +1777,7 @@
         std::string ext = paths.filename.extension().generic_string();
         std::vector<template_symbol> storage;
         actions.error_count +=
-            load_snippets(paths.filename.string(), storage, ext, actions.doc_id);
+            load_snippets(paths.filename, storage, ext, actions.doc_id);
 
         BOOST_FOREACH(template_symbol& ts, storage)
         {
@@ -1842,7 +1842,7 @@
         actions.values.builder.save();
 
         // parse the file
-        quickbook::parse_file(actions.filename.string().c_str(), actions, true);
+        quickbook::parse_file(actions.filename, actions, true);
 
         // restore the values
         actions.values.builder.restore();

Modified: trunk/tools/quickbook/src/actions.hpp
==============================================================================
--- trunk/tools/quickbook/src/actions.hpp	(original)
+++ trunk/tools/quickbook/src/actions.hpp	2011-04-04 15:31:38 EDT (Mon, 04 Apr 2011)
@@ -53,8 +53,9 @@
 
     typedef cl::symbols<std::string> string_symbols;
 
-    int load_snippets(std::string const& file, std::vector<template_symbol>& storage,
+    int load_snippets(fs::path const& file, std::vector<template_symbol>& storage,
         std::string const& extension, std::string const& doc_id);
+
     std::string syntax_highlight(
         iterator first, iterator last,
         actions& escape_actions,

Modified: trunk/tools/quickbook/src/code_snippet.cpp
==============================================================================
--- trunk/tools/quickbook/src/code_snippet.cpp	(original)
+++ trunk/tools/quickbook/src/code_snippet.cpp	2011-04-04 15:31:38 EDT (Mon, 04 Apr 2011)
@@ -24,7 +24,7 @@
     struct code_snippet_actions
     {
         code_snippet_actions(std::vector<template_symbol>& storage,
-                                 std::string const& filename,
+                                 fs::path const& filename,
                                  std::string const& doc_id,
                                  char const* source_type)
             : callout_id(0)
@@ -312,7 +312,7 @@
     };
 
     int load_snippets(
-        std::string const& file
+        fs::path const& file
       , std::vector<template_symbol>& storage   // snippets are stored in a
                                                 // vector of template_symbols
       , std::string const& extension