X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fimporter.cpp;h=787c1ea039daf83ece9c5e80d5499225e4475196;hb=28f28705612902c15cd0702cc891fba35bf2d2df;hp=6fb66cbe7d6e015d3a8755d6326bce366a3bbab1;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/importer.cpp b/synfig-core/trunk/src/synfig/importer.cpp index 6fb66cb..787c1ea 100644 --- a/synfig-core/trunk/src/synfig/importer.cpp +++ b/synfig-core/trunk/src/synfig/importer.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file importer.cpp ** \brief writeme ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -47,9 +47,9 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; -Importer::Book* sinfg::Importer::book_; +Importer::Book* synfig::Importer::book_; map *__open_importers; @@ -84,7 +84,7 @@ Importer::open(const String &filename) { if(filename.empty()) { - sinfg::error(_("Importer::open(): Cannot open empty filename")); + synfig::error(_("Importer::open(): Cannot open empty filename")); return 0; } @@ -92,13 +92,13 @@ Importer::open(const String &filename) // then use it instead. if(__open_importers->count(filename)) { - //sinfg::info("Found importer already open, using it..."); + //synfig::info("Found importer already open, using it..."); return (*__open_importers)[filename]; } if(find(filename.begin(),filename.end(),'.')==filename.end()) { - sinfg::error(_("Importer::open(): Couldn't find extension")); + synfig::error(_("Importer::open(): Couldn't find extension")); return 0; } @@ -108,7 +108,7 @@ Importer::open(const String &filename) if(!Importer::book().count(ext)) { - sinfg::error(_("Importer::open(): Unknown file type -- ")+ext); + synfig::error(_("Importer::open(): Unknown file type -- ")+ext); return 0; } @@ -120,7 +120,7 @@ Importer::open(const String &filename) } catch (String str) { - sinfg::error(str); + synfig::error(str); } return 0; }