X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsession_state_utils.h;h=de58d3eff062d3a0bb54ba6a9ade3a7f2eef0c40;hb=f25d9b122046d9ccf81108afc2fb466a32f9cbcc;hp=8825b041f3cf8255d67279489cecde05ffb19204;hpb=449aab3c465bbbf66d221fac3d7ea559f1720357;p=ardour.git

diff --git a/libs/ardour/ardour/session_state_utils.h b/libs/ardour/ardour/session_state_utils.h
index 8825b041f3..de58d3eff0 100644
--- a/libs/ardour/ardour/session_state_utils.h
+++ b/libs/ardour/ardour/session_state_utils.h
@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2007 Tim Mayberry 
+	Copyright (C) 2007 Tim Mayberry
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -22,43 +22,39 @@
 #include <vector>
 #include <string>
 
-#include <pbd/filesystem.h>
+#include "pbd/filesystem.h"
 
 namespace ARDOUR {
 
-using std::string;
-using std::vector;
-using namespace PBD;
-
 /**
  * Attempt to create a backup copy of a file.
  *
- * A copy of the file is created in the same directory using 
+ * A copy of the file is created in the same directory using
  * the same filename with the backup suffix appended.
  *
  * @return true if successful, false otherwise.
  */
-bool create_backup_file (const sys::path & file_path);
+bool create_backup_file (const PBD::sys::path & file_path);
 
 /**
- * Get the absolute paths to all state files in the directory 
+ * Get the absolute paths to all state files in the directory
  * at path directory_path.
  *
  * @param directory_path The absolute path to a directory.
  * @param result vector to contain resulting state files.
  */
-void get_state_files_in_directory (const sys::path & directory_path,
-		vector<sys::path>& result);
+void get_state_files_in_directory (const PBD::sys::path & directory_path,
+		std::vector<PBD::sys::path>& result);
 
 /**
  * Given a vector of paths to files, return a vector containing
  * the filenames without any extension.
  *
  * @param file_paths a vector containing the file paths
- * @return a vector containing a list of file names without any 
+ * @return a vector containing a list of file names without any
  * filename extension.
  */
-vector<string> get_file_names_no_extension (const vector<sys::path> & file_paths);
+std::vector<std::string> get_file_names_no_extension (const std::vector<PBD::sys::path> & file_paths);
 
 } // namespace ARDOUR