Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / dock_canvasspecific.h

diff --git a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.h b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.h
index 542ac28..24efc78 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.h
+++ b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dock_canvasspecific.h
 **     \brief Template Header
 **
-**     $Id: dock_canvasspecific.h,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**     $Id$
 **
 **     \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_STUDIO_DOCK_CANVASSPECIFIC_H
-#define __SINFG_STUDIO_DOCK_CANVASSPECIFIC_H
+#ifndef __SYNFIG_STUDIO_DOCK_CANVASSPECIFIC_H
+#define __SYNFIG_STUDIO_DOCK_CANVASSPECIFIC_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -40,10 +41,10 @@ namespace studio {
 
 class CanvasView;
 class Instance;
-       
+
 class Dock_CanvasSpecific : public Dockable
-{              
-       SigC::Connection canvas_delete_connection;
+{
+       sigc::connection canvas_delete_connection;
 protected:
        virtual void init_instance_vfunc(etl::loose_handle<Instance> instance);
 
@@ -59,9 +60,9 @@ private:
 public:
 
        etl::loose_handle<studio::CanvasView> get_canvas_view();
-       etl::loose_handle<sinfgapp::CanvasInterface> get_canvas_interface();
+       etl::loose_handle<synfigapp::CanvasInterface> get_canvas_interface();
 
-       Dock_CanvasSpecific(const sinfg::String& name,const sinfg::String& local_name,Gtk::StockID stock_id_=Gtk::StockID(" "));
+       Dock_CanvasSpecific(const synfig::String& name,const synfig::String& local_name,Gtk::StockID stock_id_=Gtk::StockID(" "));
        virtual ~Dock_CanvasSpecific();
 }; // END of Dock_CanvasSpecific