X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fimport.cpp;h=536513e11abfd58b52dea8f5c0646347b1dbdbbb;hb=4ec81d053bf1d0cbcd9f0bf048914ec8eca08f4c;hp=2af6a4d4c2748611e289910306de8ac7c1ec8ec0;hpb=675aca937d23c7f460edf42ac3ec0ffa06205a2c;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/import.cpp b/synfig-core/trunk/src/modules/lyr_std/import.cpp
index 2af6a4d..536513e 100644
--- a/synfig-core/trunk/src/modules/lyr_std/import.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/import.cpp
@@ -83,7 +83,7 @@ Import::set_param(const String & param, const ValueBase &value)
 {
 	try{
 	IMPORT(time_offset);
-	if(param=="filename" && value.same_as(filename))
+	if(param=="filename" && value.same_type_as(filename))
 	{
 		if(!get_canvas())
 		{
@@ -98,7 +98,7 @@ Import::set_param(const String & param, const ValueBase &value)
 
 		// Get rid of any %20 crap
 		{
-			unsigned int n;
+			String::size_type n;
 			while((n=newfilename.find("%20"))!=String::npos)
 				newfilename.replace(n,3," ");
 		}
@@ -143,7 +143,7 @@ Import::set_param(const String & param, const ValueBase &value)
 		if(is_absolute_path(newfilename))
 			filename_with_path=newfilename;
 		else
-			filename_with_path=get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+newfilename;
+			filename_with_path=get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfilename;
 
 		handle<Importer> newimporter;
 
@@ -151,7 +151,7 @@ Import::set_param(const String & param, const ValueBase &value)
 
 		if(!newimporter)
 		{
-			newimporter=Importer::open(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+basename(newfilename));
+			newimporter=Importer::open(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+basename(newfilename));
 			if(!newimporter)
 			{
 				synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));