Since the last change will require a recompilation of pretty much everything, I took...

git-svn-id: http://svn.voria.com/code@658 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/ETL/trunk/ETL/_stringf.h b/ETL/trunk/ETL/_stringf.h
index 49e9705..60653c3 100644 (file)
--- a/ETL/trunk/ETL/_stringf.h
+++ b/ETL/trunk/ETL/_stringf.h
@@ -1,6 +1,6 @@
 /* =========================================================================
 ** Extended Template and Library
-** stringf Prodecure Implementation
+** stringf Procedure Implementation
 ** $Id$
 **
 ** Copyright (c) 2002 Robert B. Quattlebaum Jr.
@@ -49,7 +49,7 @@ _ETL_BEGIN_CDECLS
 #define ETL_NO_THROW throw()
 #endif
 
-#ifdef HAVE_VASPRINTF  // This is the prefered method
+#ifdef HAVE_VASPRINTF  // This is the preferred method
  extern int vasprintf(char **,const char *,va_list)ETL_NO_THROW;
 #else
 
@@ -79,7 +79,7 @@ _ETL_BEGIN_NAMESPACE
 inline std::string
 vstrprintf(const char *format, va_list args)
 {
-#ifdef HAVE_VASPRINTF  // This is the prefered method (and safest)
+#ifdef HAVE_VASPRINTF  // This is the preferred method (and safest)
        char *buffer;
        std::string ret;
        vasprintf(&buffer,format,args);
@@ -150,22 +150,22 @@ basename(const std::string &str)
 {
        std::string::const_iterator iter;
 
-       if(str.size() == 1 && str[0] == ETL_DIRECTORY_SEPERATOR)
+       if(str.size() == 1 && str[0] == ETL_DIRECTORY_SEPARATOR)
                return str;
 
-       if(str.end()[-1]==ETL_DIRECTORY_SEPERATOR)
+       if(str.end()[-1]==ETL_DIRECTORY_SEPARATOR)
                iter=str.end()-2;
        else
                iter=str.end()-1;
 
        for(;iter!=str.begin();iter--)
-               if(*iter==ETL_DIRECTORY_SEPERATOR)
+               if(*iter==ETL_DIRECTORY_SEPARATOR)
                        break;
 
-       if (*iter==ETL_DIRECTORY_SEPERATOR)
+       if (*iter==ETL_DIRECTORY_SEPARATOR)
                iter++;
 
-       if(str.end()[-1]==ETL_DIRECTORY_SEPERATOR)
+       if(str.end()[-1]==ETL_DIRECTORY_SEPARATOR)
                return std::string(iter,str.end()-1);
 
        return std::string(iter,str.end());
@@ -176,20 +176,20 @@ dirname(const std::string &str)
 {
        std::string::const_iterator iter;
 
-       if(str.size() == 1 && str[0] == ETL_DIRECTORY_SEPERATOR)
+       if(str.size() == 1 && str[0] == ETL_DIRECTORY_SEPARATOR)
                return str;
 
-       if(str.end()[-1]==ETL_DIRECTORY_SEPERATOR)
+       if(str.end()[-1]==ETL_DIRECTORY_SEPARATOR)
                iter=str.end()-2;
        else
                iter=str.end()-1;
 
        for(;iter!=str.begin();iter--)
-               if(*iter==ETL_DIRECTORY_SEPERATOR)
+               if(*iter==ETL_DIRECTORY_SEPARATOR)
                        break;
 
        if(iter==str.begin())
-          if (*iter==ETL_DIRECTORY_SEPERATOR)
+          if (*iter==ETL_DIRECTORY_SEPARATOR)
                   return "/";
           else
                   return ".";
@@ -204,7 +204,7 @@ is_absolute_path(const std::string &path)
        if(path.size()>=3 && path[1]==':' && (path[2]=='\\' || path[2]=='/'))
                return true;
 #endif
-       if(!path.empty() && path[0]==ETL_DIRECTORY_SEPERATOR)
+       if(!path.empty() && path[0]==ETL_DIRECTORY_SEPARATOR)
                return true;
        return false;
 }
@@ -218,7 +218,7 @@ unix_to_local_path(const std::string &path)
                switch(*iter)
                {
                case '/':
-                       ret+=ETL_DIRECTORY_SEPERATOR;
+                       ret+=ETL_DIRECTORY_SEPARATOR;
                        break;
                case '~':
                        ret+='~';
@@ -246,12 +246,12 @@ get_root_from_path(std::string path)
 
        for(iter=path.begin();iter!=path.end();++iter)
        {
-               if(*iter==ETL_DIRECTORY_SEPERATOR)
+               if(*iter==ETL_DIRECTORY_SEPARATOR)
                        break;
                ret+=*iter;
        }
        //if(iter!=path.end())
-               ret+=ETL_DIRECTORY_SEPERATOR;
+               ret+=ETL_DIRECTORY_SEPARATOR;
        return ret;
 }
 
@@ -260,7 +260,7 @@ remove_root_from_path(std::string path)
 {
        while(!path.empty())
        {
-               if(path[0]==ETL_DIRECTORY_SEPERATOR)
+               if(path[0]==ETL_DIRECTORY_SEPARATOR)
                {
                        path.erase(path.begin());
                        return path;
@@ -283,8 +283,8 @@ cleanup_path(std::string path)
                if((dir=="../" || dir=="..\\") && ret.size())
                {
                        ret=dirname(ret);
-                       if (*(ret.end()-1)!=ETL_DIRECTORY_SEPERATOR)
-                               ret+=ETL_DIRECTORY_SEPERATOR;
+                       if (*(ret.end()-1)!=ETL_DIRECTORY_SEPARATOR)
+                               ret+=ETL_DIRECTORY_SEPARATOR;
                }
                else if((dir!="./" && dir!=".\\") && dir!=".")
                        ret+=dir;
@@ -292,8 +292,8 @@ cleanup_path(std::string path)
        }
        if (ret.size()==0)ret+='.';
 
-       // Remove any trailing directory seperators
-       if(ret.size() && ret[ret.size()-1]==ETL_DIRECTORY_SEPERATOR)
+       // Remove any trailing directory separators
+       if(ret.size() && ret[ret.size()-1]==ETL_DIRECTORY_SEPARATOR)
                ret.erase(ret.begin()+ret.size()-1);
        return ret;
 }
@@ -307,7 +307,7 @@ absolute_path(std::string path)
                return cleanup_path(ret);
        if(is_absolute_path(path))
                return cleanup_path(path);
-       return cleanup_path(ret+ETL_DIRECTORY_SEPERATOR+path);
+       return cleanup_path(ret+ETL_DIRECTORY_SEPARATOR+path);
 }
 
 inline std::string
@@ -343,7 +343,7 @@ relative_path(std::string curr_path,std::string dest_path)
 
        while(!curr_path.empty())
        {
-               dest_path=std::string("..")+ETL_DIRECTORY_SEPERATOR+dest_path;
+               dest_path=std::string("..")+ETL_DIRECTORY_SEPARATOR+dest_path;
                curr_path=remove_root_from_path(curr_path);
        }
 

diff --git a/ETL/trunk/ETL/etl_config.h b/ETL/trunk/ETL/etl_config.h
index faea695..9be9f00 100644 (file)
--- a/ETL/trunk/ETL/etl_config.h
+++ b/ETL/trunk/ETL/etl_config.h
@@ -15,9 +15,9 @@
 #endif
 
 #ifdef WIN32
-#define ETL_DIRECTORY_SEPERATOR                '\\'
+#define ETL_DIRECTORY_SEPARATOR                '\\'
 #else
-#define ETL_DIRECTORY_SEPERATOR                '/'
+#define ETL_DIRECTORY_SEPARATOR                '/'
 #endif
 
 #ifndef ETL_FLAG_NONAMESPACE

diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp
index d1f1390..0fbab09 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp
+++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp
@@ -345,8 +345,8 @@ Layer_Freetype::new_face(const String &newfont)
 
        if(get_canvas())
        {
-               if(error)error=FT_New_Face(ft_library,(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+newfont).c_str(),face_index,&face);
-               if(error)error=FT_New_Face(ft_library,(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+newfont+".ttf").c_str(),face_index,&face);
+               if(error)error=FT_New_Face(ft_library,(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfont).c_str(),face_index,&face);
+               if(error)error=FT_New_Face(ft_library,(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfont+".ttf").c_str(),face_index,&face);
        }
 
 #ifdef USE_MAC_FT_FUNCS

diff --git a/synfig-core/trunk/src/modules/lyr_std/import.cpp b/synfig-core/trunk/src/modules/lyr_std/import.cpp
index 28801a1..536513e 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/import.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/import.cpp
@@ -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()));

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 6404b84..f56393d 100644 (file)
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -526,7 +526,7 @@ Canvas::surefind_canvas(const String &id)
                        if(is_absolute_path(file_name))
                                external_canvas=open_canvas(file_name);
                        else
-                               external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPERATOR+file_name);
+                               external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name);
 
                        if(!external_canvas)
                                throw Exception::FileNotFound(file_name);
@@ -553,7 +553,7 @@ Canvas::surefind_canvas(const String &id)
                return new_child_canvas(id);
        }
 
-       // If the first character is the seperator, then
+       // If the first character is the separator, then
        // this references the root canvas.
        if(id[0]==':')
                return get_root()->surefind_canvas(string(id,1));
@@ -611,7 +611,7 @@ Canvas::find_canvas(const String &id)const
                        if(is_absolute_path(file_name))
                                external_canvas=open_canvas(file_name);
                        else
-                               external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPERATOR+file_name);
+                               external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name);
 
                        if(!external_canvas)
                                throw Exception::FileNotFound(file_name);
@@ -636,7 +636,7 @@ Canvas::find_canvas(const String &id)const
                throw Exception::IDNotFound("Child Canvas in Parent Canvas: (child)"+id);
        }
 
-       // If the first character is the seperator, then
+       // If the first character is the separator, then
        // this references the root canvas.
        if(id.find_first_of(':')==0)
                return get_root()->find_canvas(string(id,1));

diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h
index dce5542..38b4565 100644 (file)
--- a/synfig-core/trunk/src/synfig/general.h
+++ b/synfig-core/trunk/src/synfig/general.h
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file general.h
-**     \brief General macros, classes, and prodecure declarations
+**     \brief General macros, classes, and procedure declarations
 **
 **     $Id$
 **

diff --git a/synfig-core/trunk/src/synfig/listimporter.cpp b/synfig-core/trunk/src/synfig/listimporter.cpp
index 7dcd277..11b59ea 100644 (file)
--- a/synfig-core/trunk/src/synfig/listimporter.cpp
+++ b/synfig-core/trunk/src/synfig/listimporter.cpp
@@ -63,7 +63,7 @@ ListImporter::ListImporter(const String &filename)
                return;
        }
        String line;
-       String prefix=etl::dirname(filename)+ETL_DIRECTORY_SEPERATOR;
+       String prefix=etl::dirname(filename)+ETL_DIRECTORY_SEPARATOR;
        while(!stream.eof())
        {
                getline(stream,line);

diff --git a/synfig-studio/trunk/src/gtkmm/about.cpp b/synfig-studio/trunk/src/gtkmm/about.cpp
index 73091f0..67d0c76 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/about.cpp
+++ b/synfig-studio/trunk/src/gtkmm/about.cpp
@@ -165,18 +165,18 @@ About::About():
 
        std::string imagepath;
 #ifdef WIN32
-       imagepath=App::get_base_path()+ETL_DIRECTORY_SEPERATOR+IMAGE_DIR;
+       imagepath=App::get_base_path()+ETL_DIRECTORY_SEPARATOR+IMAGE_DIR;
 #else
        imagepath=IMAGE_DIR;
 #endif
        char* synfig_root=getenv("SYNFIG_ROOT");
        if(synfig_root) {
                imagepath=synfig_root;
-               imagepath+=ETL_DIRECTORY_SEPERATOR;
+               imagepath+=ETL_DIRECTORY_SEPARATOR;
 
                imagepath+="share/pixmaps";
        }
-       imagepath+=ETL_DIRECTORY_SEPERATOR;
+       imagepath+=ETL_DIRECTORY_SEPARATOR;
 
 
        // Create the Logo

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index c45d4c3..e4fbf96 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -1726,7 +1726,7 @@ App::dialog_open_file(const std::string &title, std::string &filename)
 
        if(basename(filename)==filename)
        {
-               gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),(prev_path+ETL_DIRECTORY_SEPERATOR).c_str());
+               gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),(prev_path+ETL_DIRECTORY_SEPARATOR).c_str());
        }
        else
                gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),dirname(filename).c_str());

diff --git a/synfig-studio/trunk/src/gtkmm/autorecover.cpp b/synfig-studio/trunk/src/gtkmm/autorecover.cpp
index 4235a19..a4b45d4 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/autorecover.cpp
+++ b/synfig-studio/trunk/src/gtkmm/autorecover.cpp
@@ -159,7 +159,7 @@ AutoRecover::get_shadow_file_name(const synfig::String& filename)
 
        return Glib::build_filename(get_shadow_directory(),strprintf("%08X-%s",hash1,basename(filename).c_str()));
 
-//     return dirname(filename) + ETL_DIRECTORY_SEPERATOR + ".shadow_" + basename(filename);
+//     return dirname(filename) + ETL_DIRECTORY_SEPARATOR + ".shadow_" + basename(filename);
 }
 
 bool

diff --git a/synfig-studio/trunk/src/gtkmm/dock_info.cpp b/synfig-studio/trunk/src/gtkmm/dock_info.cpp
index 93eec59..5bd393e 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_info.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_info.cpp
@@ -107,7 +107,7 @@ studio::Dock_Info::Dock_Info()
        table->attach(x,1,2,0,2,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
        table->attach(y,1,2,2,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 
-       //seperator
+       //separator
        table->attach(*manage(new Gtk::VSeparator),2,3,0,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 
        //color label

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
index 8e59a5c..1764ae2 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
@@ -94,11 +94,11 @@ IconControler::IconControler(const synfig::String& /*basepath*/)
        char* synfig_root=getenv("SYNFIG_ROOT");
        if(synfig_root) {
                path_to_icons=synfig_root;
-               path_to_icons+=ETL_DIRECTORY_SEPERATOR;
+               path_to_icons+=ETL_DIRECTORY_SEPARATOR;
 
                path_to_icons+="share/pixmaps/synfigstudio";
        }
-       path_to_icons+=ETL_DIRECTORY_SEPERATOR;
+       path_to_icons+=ETL_DIRECTORY_SEPARATOR;
 
        try{
        Gtk::Window::set_default_icon_from_file(path_to_icons+"synfig_icon."+IMAGE_EXT);

diff --git a/synfig-studio/trunk/src/gtkmm/renddesc.cpp b/synfig-studio/trunk/src/gtkmm/renddesc.cpp
index 3093f92..cb46109 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/renddesc.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renddesc.cpp
@@ -36,7 +36,7 @@
 #include <gtkmm/box.h>
 #include <ETL/misc>
 #include <synfig/general.h>
-//#include <gtkmm/seperator.h>
+//#include <gtkmm/separator.h>
 
 #endif
 

diff --git a/synfig-studio/trunk/src/gtkmm/render.cpp b/synfig-studio/trunk/src/gtkmm/render.cpp
index d648d38..4b2f2b2 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/render.cpp
+++ b/synfig-studio/trunk/src/gtkmm/render.cpp
@@ -180,7 +180,7 @@ RenderSettings::RenderSettings(Gtk::Window& parent,handle<synfigapp::CanvasInter
 
        try
        {
-               entry_filename.set_text(Glib::build_filename(Glib::get_home_dir(),Glib::ustring("Desktop")+ETL_DIRECTORY_SEPERATOR+Glib::ustring("output.png")));
+               entry_filename.set_text(Glib::build_filename(Glib::get_home_dir(),Glib::ustring("Desktop")+ETL_DIRECTORY_SEPARATOR+Glib::ustring("output.png")));
        }
        catch(...)
        {

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index d662c55..747f3fd 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -787,7 +787,7 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
                if(!data.empty())
                {
                        if(!load_sketch(data))
-                               load_sketch(dirname(canvas->get_file_name())+ETL_DIRECTORY_SEPERATOR+basename(data));
+                               load_sketch(dirname(canvas->get_file_name())+ETL_DIRECTORY_SEPARATOR+basename(data));
                }
        }