X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenddesc.cpp;fp=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenddesc.cpp;h=82f104b8339895ffb71fef2cb4d66741462f3d6f;hb=02252941b29de64037116f4d37991a38d9ff0d94;hp=8a709d78484cb6cda49da893e7d742893a8a114a;hpb=34f6fabfcefdc878ba3c08b82358ae4aef439e99;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/renddesc.cpp b/synfig-studio/trunk/src/gtkmm/renddesc.cpp index 8a709d7..82f104b 100644 --- a/synfig-studio/trunk/src/gtkmm/renddesc.cpp +++ b/synfig-studio/trunk/src/gtkmm/renddesc.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file renddesc.cpp ** \brief Template File ** @@ -32,7 +32,7 @@ #include #include #include -#include +#include //#include #endif @@ -41,17 +41,17 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ -#ifndef SINFG_MAX_PIXEL_WIDTH -#define SINFG_MAX_PIXEL_WIDTH (~(1<<31)) +#ifndef SYNFIG_MAX_PIXEL_WIDTH +#define SYNFIG_MAX_PIXEL_WIDTH (~(1<<31)) #endif -#ifndef SINFG_MAX_PIXEL_HEIGHT -#define SINFG_MAX_PIXEL_HEIGHT (~(1<<31)) +#ifndef SYNFIG_MAX_PIXEL_HEIGHT +#define SYNFIG_MAX_PIXEL_HEIGHT (~(1<<31)) #endif #if ! defined(_) @@ -76,8 +76,8 @@ using namespace studio; Widget_RendDesc::Widget_RendDesc(): Gtk::Table(1,2,false), - adjustment_width(1,1,SINFG_MAX_PIXEL_WIDTH), - adjustment_height(1,1,SINFG_MAX_PIXEL_HEIGHT), + adjustment_width(1,1,SYNFIG_MAX_PIXEL_WIDTH), + adjustment_height(1,1,SYNFIG_MAX_PIXEL_HEIGHT), adjustment_xres(0,0,10000000), adjustment_yres(0,0,10000000), adjustment_phy_width(0,0,10000000), @@ -221,7 +221,7 @@ Widget_RendDesc::~Widget_RendDesc() { } -void Widget_RendDesc::set_rend_desc(const sinfg::RendDesc &rend_desc) +void Widget_RendDesc::set_rend_desc(const synfig::RendDesc &rend_desc) { if(update_lock)return; @@ -260,12 +260,12 @@ Widget_RendDesc::refresh() toggle_im_span->set_active((bool)(rend_desc_.get_flags()&RendDesc::IM_SPAN)); } -void Widget_RendDesc::apply_rend_desc(const sinfg::RendDesc &rend_desc) +void Widget_RendDesc::apply_rend_desc(const synfig::RendDesc &rend_desc) { set_rend_desc(rend_desc); } -const sinfg::RendDesc & +const synfig::RendDesc & Widget_RendDesc::get_rend_desc() { return rend_desc_;