Change to Andreas Jochens patch for Debian bugs #358474/#359690

[synfig.git] / synfig-studio / trunk / src / gtkmm / renddesc.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/renddesc.cpp b/synfig-studio/trunk/src/gtkmm/renddesc.cpp
index 8a709d7..49a7ef3 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/renddesc.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renddesc.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file renddesc.cpp
 **     \brief Template File
 **
 **     $Id: renddesc.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -32,7 +33,7 @@
 #include <gtkmm/label.h>
 #include <gtkmm/frame.h>
 #include <ETL/misc>
-#include <sinfg/general.h>
+#include <synfig/general.h>
 //#include <gtkmm/seperator.h>
 
 #endif
@@ -41,17 +42,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 +77,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 +222,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 +261,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_;