X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ftemplate_utils.cc;h=aa0a583af4d982771658c92786720ad4108e2448;hb=1c1b359ff21aac57bd71d291049d657f66cf31f5;hp=22fc6f38df6e904dbced398b1444638bb53fa4e7;hpb=ca10cc82a4374a5b413c06ead6cc89c53f8881ee;p=ardour.git

diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index 22fc6f38df..aa0a583af4 100644
--- a/libs/ardour/template_utils.cc
+++ b/libs/ardour/template_utils.cc
@@ -12,6 +12,9 @@
 #include "ardour/filename_extensions.h"
 #include "ardour/io.h"
 
+using namespace std;
+using namespace PBD;
+
 namespace ARDOUR {
 
 sys::path
@@ -61,7 +64,7 @@ user_route_template_directory ()
 }
 
 static bool
-template_filter (const string &str, void *arg)
+template_filter (const string &str, void */*arg*/)
 {
 	cerr << "Checking into " << str << " using " << template_suffix << endl;
 	return (str.length() > strlen(template_suffix) &&
@@ -77,14 +80,14 @@ find_session_templates (vector<TemplateInfo>& template_names)
 	spath += user_template_directory ();
 
 	templates = scanner (spath.to_string(), template_filter, 0, false, true);
-	
+
 	if (!templates) {
 		cerr << "Found nothing along " << spath.to_string() << endl;
 		return;
 	}
 
 	cerr << "Found " << templates->size() << " along " << spath.to_string() << endl;
-	
+
 	for (vector<string*>::iterator i = templates->begin(); i != templates->end(); ++i) {
 		string fullpath = *(*i);
 
@@ -102,7 +105,7 @@ find_session_templates (vector<TemplateInfo>& template_names)
 		template_names.push_back (rti);
 	}
 
-	free (templates);
+	delete templates;
 }
 
 void
@@ -114,11 +117,11 @@ find_route_templates (vector<TemplateInfo>& template_names)
 	spath += user_route_template_directory ();
 
 	templates = scanner (spath.to_string(), template_filter, 0, false, true);
-	
+
 	if (!templates) {
 		return;
 	}
-	
+
 	for (vector<string*>::iterator i = templates->begin(); i != templates->end(); ++i) {
 		string fullpath = *(*i);
 
@@ -129,7 +132,7 @@ find_route_templates (vector<TemplateInfo>& template_names)
 		}
 
 		XMLNode* root = tree.root();
-		
+
 		TemplateInfo rti;
 
 		rti.name = IO::name_from_state (*root->children().front());
@@ -138,7 +141,7 @@ find_route_templates (vector<TemplateInfo>& template_names)
 		template_names.push_back (rti);
 	}
 
-	free (templates);
+	delete templates;
 }
 
 }