X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.h;h=80cf4d7600a3e433853bf2ab3b16942f99599ee6;hb=d62300935546505305385dba525025a548c7b26b;hp=f27ace1d33d97eb779bbd9fe6498656ec8b7d842;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/loadcanvas.h b/synfig-core/trunk/src/synfig/loadcanvas.h index f27ace1..80cf4d7 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.h +++ b/synfig-core/trunk/src/synfig/loadcanvas.h @@ -1,28 +1,29 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file loadcanvas.h ** \brief writeme ** ** $Id: loadcanvas.h,v 1.1.1.1 2005/01/04 01:23:14 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 */ /* ========================================================================= */ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LOADCANVAS_H -#define __SINFG_LOADCANVAS_H +#ifndef __SYNFIG_LOADCANVAS_H +#define __SYNFIG_LOADCANVAS_H /* === H E A D E R S ======================================================= */ @@ -50,7 +51,7 @@ namespace xmlpp { class Node; class Element; }; -namespace sinfg { +namespace synfig { /*! \class CanvasParser ** \todo writeme @@ -111,10 +112,10 @@ public: //! Returns the number of warnings in the last parse int warning_count()const { return total_warnings_; } - void set_path(const sinfg::String& x) { path=x; } + void set_path(const synfig::String& x) { path=x; } + + const synfig::String& get_path()const { return path; } - const sinfg::String& get_path()const { return path; } - //! \todo writeme Canvas::Handle parse_from_file(const String &filename); @@ -179,9 +180,9 @@ extern Canvas::Handle open_canvas_as(const String &filename,const String &as); //! Retrieves a Canvas from a string in XML format extern Canvas::Handle string_to_canvas(const String &data); -std::map >& get_open_canvas_map(); +std::map >& get_open_canvas_map(); -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */