X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fmodule.cpp;h=2bef9aa0dddbf4951995069b382b547143f509aa;hb=28f28705612902c15cd0702cc891fba35bf2d2df;hp=f893b74e963041eae2c9ce48877918be4685ce39;hpb=2c43cbfff01496919316f600ee76112be551392d;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/module.cpp b/synfig-core/trunk/src/synfig/module.cpp index f893b74..2bef9aa 100644 --- a/synfig-core/trunk/src/synfig/module.cpp +++ b/synfig-core/trunk/src/synfig/module.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file module.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" @@ -42,16 +42,16 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; -Module::Book *sinfg::Module::book_; +Module::Book *synfig::Module::book_; /* === P R O C E D U R E S ================================================= */ bool Module::subsys_init(const String &prefix) { - #ifndef SINFG_LTDL_NO_STATIC + #ifndef SYNFIG_LTDL_NO_STATIC //LTDL_SET_PRELOADED_SYMBOLS(); #endif @@ -63,15 +63,15 @@ Module::subsys_init(const String &prefix) } lt_dladdsearchdir("."); - lt_dladdsearchdir("~/.sinfg/modules"); - lt_dladdsearchdir((prefix+"/lib/sinfg/modules").c_str()); + lt_dladdsearchdir("~/.synfig/modules"); + lt_dladdsearchdir((prefix+"/lib/synfig/modules").c_str()); #ifdef LIBDIR - lt_dladdsearchdir(LIBDIR"/sinfg/modules"); + lt_dladdsearchdir(LIBDIR"/synfig/modules"); #endif #ifdef __APPLE__ - lt_dladdsearchdir("/Library/Frameworks/sinfg.framework/Resources/modules"); + lt_dladdsearchdir("/Library/Frameworks/synfig.framework/Resources/modules"); #endif - lt_dladdsearchdir("/usr/local/lib/sinfg/modules"); + lt_dladdsearchdir("/usr/local/lib/synfig/modules"); lt_dladdsearchdir("."); book_=new Book; @@ -100,13 +100,13 @@ Module::book() } void -sinfg::Module::Register(Module::Handle mod) +synfig::Module::Register(Module::Handle mod) { book()[mod->Name()]=mod; } bool -sinfg::Module::Register(const String &module_name, ProgressCallback *callback) +synfig::Module::Register(const String &module_name, ProgressCallback *callback) { lt_dlhandle module;