Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/dockmanager.h b/synfig-studio/trunk/src/gtkmm/dockmanager.h
index 6a6765a..98df376 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dockmanager.h
+++ b/synfig-studio/trunk/src/gtkmm/dockmanager.h
@@ -1,34 +1,35 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dockmanager.h
 **     \brief Template Header
 **
-**     $Id: dockmanager.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_DOCKMANAGER_H
-#define __SINFG_DOCKMANAGER_H
+#ifndef __SYNFIG_DOCKMANAGER_H
+#define __SYNFIG_DOCKMANAGER_H
 
 /* === H E A D E R S ======================================================= */
 
 #include <vector>
 #include <list>
-#include <sinfg/string.h>
+#include <synfig/string.h>
 #include <sigc++/signal.h>
 #include <sigc++/object.h>
 #include <ETL/smart_ptr>
@@ -44,18 +45,18 @@ namespace studio {
 class Dockable;
 class DockDialog;
 class DockSettings;
-       
+
 class DockManager : public sigc::trackable
 {
        friend class Dockable;
        friend class DockDialog;
        friend class DockSettings;
-               
+
        std::list<Dockable*> dockable_list_;
        std::list<DockDialog*> dock_dialog_list_;
 
        sigc::signal<void,Dockable*> signal_dockable_registered_;
-       
+
        etl::smart_ptr<DockSettings> dock_settings;
 
 public:
@@ -69,9 +70,9 @@ public:
 
        void register_dockable(Dockable& x);
        bool unregister_dockable(Dockable& x);
-       Dockable& find_dockable(const sinfg::String& x);
-       void present(sinfg::String x);
-       
+       Dockable& find_dockable(const synfig::String& x);
+       void present(synfig::String x);
+
 }; // END of class DockManager
 
 }; // END of namespace studio