Changed namespace names, removed almost all references to "Om"

git-svn-id: http://svn.drobilla.net/lad/ingen@97 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 9 insertions, 7 deletions

diff --git a/src/libs/client/PatchLibrarian.cpp.new b/src/libs/client/PatchLibrarian.cpp.new
index 8e26e833..d05d34c5 100644
--- a/src/libs/client/PatchLibrarian.cpp.new
+++ b/src/libs/client/PatchLibrarian.cpp.new
@@ -1,11 +1,11 @@
-/* This file is part of Om.  Copyright (C) 2005 Dave Robillard.
+/* This file is part of Ingen.  Copyright (C) 2005 Dave Robillard.
  * 
- * Om is free software; you can redistribute it and/or modify it under the
+ * Ingen 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.
  * 
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Ingen 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 details.
  * 
@@ -40,7 +40,8 @@
 using std::string; using std::vector; using std::pair;
 using std::cerr; using std::cout; using std::endl;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 	
 /** Searches for the filename passed in the path, returning the full
@@ -100,7 +101,7 @@ PatchLibrarian::find_file(const string& filename, const string& additional_path)
  *
  * This will break if:
  * - The filename does not have an extension (ie contain a ".")
- * - The patch_model has no (Om) path
+ * - The patch_model has no (Ingen) path
  */
 void
 PatchLibrarian::save_patch(PatchModel* patch_model, const string& filename, bool recursive)
@@ -391,7 +392,7 @@ PatchLibrarian::load_patch(PatchModel* pm, bool wait, bool existing)
 	}
 
 	if (xmlStrcmp(cur->name, (const xmlChar*) "patch")) {
-		cerr << "File is not an Om patch file, root node != patch" << endl;
+		cerr << "File is not an Ingen patch file (root node != <patch>)" << endl;
 		xmlFreeDoc(doc);
 		return "";
 	}
@@ -827,4 +828,5 @@ PatchLibrarian::parse_preset(const PatchModel* patch, xmlDocPtr doc, const xmlNo
 	return pm;
 }
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen