From 540d7dd22fb6101d13d201c0a932cd1c6916f28c Mon Sep 17 00:00:00 2001
From: Davis Vigneault <davis.vigneault@gmail.com>
Date: Fri, 4 Dec 2015 12:21:48 +0000
Subject: [PATCH] ENH: Update itkFileTools to allow std::string arguments.

Methods in itk::FileTools have been updated to allow the user
to pass an std::string instead of const char *.  A const
reference has been used for efficiency purposes.

Change-Id: I78e363b627c94d059438c514cc95936117765439
---
 Modules/IO/XML/include/itkFileTools.h | 34 ++++++++++++++-------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/Modules/IO/XML/include/itkFileTools.h b/Modules/IO/XML/include/itkFileTools.h
index 73c492213e2..1b76af8dd6d 100644
--- a/Modules/IO/XML/include/itkFileTools.h
+++ b/Modules/IO/XML/include/itkFileTools.h
@@ -19,6 +19,8 @@
 #ifndef itkFileTools_h
 #define itkFileTools_h
 
+#include <string>
+
 namespace itk
 {
 
@@ -30,18 +32,19 @@ namespace itk
 class FileTools
 {
 public:
+
   /** Helper function to create the directory, if it does not exist. */
-  static void CreateDirectory( const char* fn );
+  static void CreateDirectory( const std::string &fn );
 
   /** Function to create a file, if it does not exist. */
-  static void CreateFile( const char* fn );
+  static void CreateFile( const std::string &fn );
+
 };
 
 } // namespace itk
 
 // here comes the implementation
 
-#include <string>
 #include "itksys/SystemTools.hxx"
 #include "itkMacro.h"
 
@@ -50,26 +53,25 @@ namespace itk
 
 /** Helper function to create the directory, if it does not exist. */
 inline void
-FileTools::CreateDirectory( const char* dir )
+FileTools::CreateDirectory( const std::string &dir )
 {
-  if ( dir == ITK_NULLPTR || itksys::SystemTools::FileExists(dir,true) )
+  if ( dir.empty() || itksys::SystemTools::FileExists(dir.c_str(),true) )
     {
     ExceptionObject eo( __FILE__, __LINE__, "directory cannot be created" );
     throw eo;
     }
 
   // do nothing if it already exists
-  std::string s(dir);
-  if ( s == "" || s == "." || itksys::SystemTools::FileIsDirectory(dir) )
+  if ( "" == dir || "." == dir || itksys::SystemTools::FileIsDirectory(dir.c_str()) )
     {
     return;
     }
 
   // create it
-  itksys::SystemTools::MakeDirectory( dir );
+  itksys::SystemTools::MakeDirectory( dir.c_str() );
 
   // check successful or not
-  if ( !itksys::SystemTools::FileIsDirectory(dir) )
+  if ( !itksys::SystemTools::FileIsDirectory( dir.c_str() ) )
     {
     ExceptionObject eo( __FILE__, __LINE__, "directory cannot be created" );
     throw eo;
@@ -78,29 +80,29 @@ FileTools::CreateDirectory( const char* dir )
 
 /** Helper function to create a file, if it does not exist. */
 inline void
-FileTools::CreateFile( const char* fn )
+FileTools::CreateFile( const std::string &fn )
 {
-  if ( fn == ITK_NULLPTR || *fn == 0 || itksys::SystemTools::FileIsDirectory(fn) )
+  if ( fn.empty() || itksys::SystemTools::FileIsDirectory( fn.c_str() ) )
     {
     ExceptionObject eo( __FILE__, __LINE__, "file cannot be created" );
     throw eo;
     }
 
   // do nothing if it already exists
-  if ( itksys::SystemTools::FileExists(fn,true) )
+  if ( itksys::SystemTools::FileExists(fn.c_str() ,true) )
     {
     return;
     }
 
   // make sure the directory exists
-  std::string dir = itksys::SystemTools::GetFilenamePath( fn );
-  FileTools::CreateDirectory( dir.c_str() );
+  std::string dir = itksys::SystemTools::GetFilenamePath( fn.c_str() );
+  FileTools::CreateDirectory( dir );
 
   // create the file
-  itksys::SystemTools::Touch( fn, true );
+  itksys::SystemTools::Touch( fn.c_str(), true );
 
   // check successful or not
-  if ( !itksys::SystemTools::FileExists(fn,true) )
+  if ( !itksys::SystemTools::FileExists( fn.c_str(), true) )
     {
     ExceptionObject eo( __FILE__, __LINE__, "file cannot be created" );
     throw eo;