Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp
index e22501d..dc655ef 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dock_canvasspecific.cpp
 **     \brief Template File
 **
-**     $Id: dock_canvasspecific.cpp,v 1.3 2005/01/13 20:23:01 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
 */
 /* ========================================================================= */
@@ -42,13 +43,15 @@
 #include "canvasview.h"
 #include <ETL/clock>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -59,7 +62,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-Dock_CanvasSpecific::Dock_CanvasSpecific(const sinfg::String& name,const sinfg::String& local_name,Gtk::StockID stock_id_):
+Dock_CanvasSpecific::Dock_CanvasSpecific(const synfig::String& name,const synfig::String& local_name,Gtk::StockID stock_id_):
        Dockable(name,local_name,stock_id_)
 {
        App::signal_instance_created().connect(sigc::mem_fun(*this,&Dock_CanvasSpecific::init_instance));
@@ -75,7 +78,7 @@ Dock_CanvasSpecific::get_canvas_view()
        return App::get_selected_canvas_view();
 }
 
-etl::loose_handle<sinfgapp::CanvasInterface>
+etl::loose_handle<synfigapp::CanvasInterface>
 Dock_CanvasSpecific::get_canvas_interface()
 {
        if(get_canvas_view())
@@ -84,17 +87,17 @@ Dock_CanvasSpecific::get_canvas_interface()
 }
 
 void
-Dock_CanvasSpecific::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view)
+Dock_CanvasSpecific::init_canvas_view_vfunc(etl::loose_handle<CanvasView> /*canvas_view*/)
 {
 }
 
 void
-Dock_CanvasSpecific::init_instance_vfunc(etl::loose_handle<Instance> instance)
+Dock_CanvasSpecific::init_instance_vfunc(etl::loose_handle<Instance> /*instance*/)
 {
 }
 
 void
-Dock_CanvasSpecific::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view)
+Dock_CanvasSpecific::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> /*canvas_view*/)
 {
 }
 
@@ -104,11 +107,11 @@ Dock_CanvasSpecific::init_instance(etl::handle<Instance> instance)
        etl::clock timer;timer.reset();
        instance->signal_canvas_view_created().connect(sigc::mem_fun(*this,&Dock_CanvasSpecific::init_canvas_view));
        init_instance_vfunc(instance);
-       sinfg::info("%s init_instance() took %f seconds",get_local_name().c_str(),float(timer()));
+       // synfig::info("%s init_instance() took %f seconds",get_local_name().c_str(),float(timer()));
 }
 
 void
-Dock_CanvasSpecific::delete_instance(etl::handle<Instance> instance)
+Dock_CanvasSpecific::delete_instance(etl::handle<Instance> /*instance*/)
 {
        changed_canvas_view_vfunc(0);
 }
@@ -126,10 +129,10 @@ Dock_CanvasSpecific::init_canvas_view(CanvasView* canvas_view)
                                ),
                                false
                        )
-               )       
+               )
        );
        */
-       sinfg::info("%s init_canvas_view() Starting init...",get_local_name().c_str());
+       // synfig::info("%s init_canvas_view() Starting init...",get_local_name().c_str());
        etl::clock timer;timer.reset();
        App::signal_canvas_view_focus().connect(
                sigc::hide(
@@ -140,7 +143,7 @@ Dock_CanvasSpecific::init_canvas_view(CanvasView* canvas_view)
                )
        );
        init_canvas_view_vfunc(canvas_view);
-       sinfg::info("%s init_canvas_view() took %f seconds",get_local_name().c_str(),float(timer()));
+       // synfig::info("%s init_canvas_view() took %f seconds",get_local_name().c_str(),float(timer()));
 }
 
 void
@@ -161,12 +164,12 @@ Dock_CanvasSpecific::canvas_view_changed()
                );
        }
 */
-       
-#ifdef _DEBUG
-       sinfg::info("%s canvas_view_changed: start",get_local_name().c_str());
-#endif
+
+// #ifdef _DEBUG
+//     synfig::info("%s canvas_view_changed: start",get_local_name().c_str());
+// #endif
        changed_canvas_view_vfunc(canvas_view);
-#ifdef _DEBUG
-       sinfg::info("%s canvas_view_changed: end",get_local_name().c_str());
-#endif
+// #ifdef _DEBUG
+//     synfig::info("%s canvas_view_changed: end",get_local_name().c_str());
+// #endif
 }