Remove UUID from settings API

Don’t recall what the intent was with this.
dardevelin · Sep 10, 2012 · b2fa6ff · b2fa6ff
1 parent 2333b23
commit b2fa6ff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/Frameworks/document/src/document.h b/Frameworks/document/src/document.h
@@ -248,7 +248,7 @@ namespace document
 		std::string file_type () const;
 		std::string path_attributes () const  { return _path_attributes; }
 		scope::scope_t scope () const         { return file_type() + " " + path_attributes(); }
-		settings_t const settings () const    { return settings_for_path(virtual_path(), scope(), path::parent(_path), identifier(), variables(std::map<std::string, std::string>(), false)); }
+		settings_t const settings () const    { return settings_for_path(virtual_path(), scope(), path::parent(_path), variables(std::map<std::string, std::string>(), false)); }
 
 		std::map<std::string, std::string> variables (std::map<std::string, std::string> map, bool sourceFileSystem = true) const;
 

diff --git a/Frameworks/settings/src/settings.cc b/Frameworks/settings/src/settings.cc
@@ -3,7 +3,6 @@
 #include "track_paths.h"
 #include <OakSystem/application.h>
 #include <plist/plist.h>
-#include <plist/uuid.h>
 #include <oak/oak.h>
 #include <regexp/format_string.h>
 #include <regexp/glob.h>
@@ -197,7 +196,7 @@ void settings_t::set_global_settings_path (std::string const& path)
 	global_settings_path() = path;
 }
 
-settings_t settings_for_path (std::string const& path, scope::scope_t const& scope, std::string const& directory, oak::uuid_t const& uuid, std::map<std::string, std::string> variables)
+settings_t settings_for_path (std::string const& path, scope::scope_t const& scope, std::string const& directory, std::map<std::string, std::string> variables)
 {
 	return expanded_variables_for(directory != NULL_STR ? directory : (path != NULL_STR ? path::parent(path) : path::home()), path, scope, variables);
 }

diff --git a/Frameworks/settings/src/settings.h b/Frameworks/settings/src/settings.h
@@ -6,7 +6,6 @@
 #include <oak/oak.h>
 #include <text/format.h>
 #include <scope/scope.h>
-#include <plist/uuid.h>
 
 struct PUBLIC settings_t
 {
@@ -57,7 +56,7 @@ struct PUBLIC settings_t
 	static std::string to_str (char const* value)               { return value;                     }
 };
 
-PUBLIC settings_t settings_for_path (std::string const& path = NULL_STR, scope::scope_t const& scope = "", std::string const& directory = NULL_STR, oak::uuid_t const& uuid = oak::uuid_t(), std::map<std::string, std::string> variables = std::map<std::string, std::string>());
+PUBLIC settings_t settings_for_path (std::string const& path = NULL_STR, scope::scope_t const& scope = "", std::string const& directory = NULL_STR, std::map<std::string, std::string> variables = std::map<std::string, std::string>());
 PUBLIC std::map<std::string, std::string> variables_for_path (std::string const& documentPath = NULL_STR, scope::scope_t const& scope = "", std::map<std::string, std::string> existingVariables = std::map<std::string, std::string>());
 
 #endif /* end of include guard: SETTINGS_H_F99MMG5F */