Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp b/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
index 8c93fb3..787b054 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
@@ -2,19 +2,20 @@
 /*!    \file keymapsettings.cpp
 **     \brief Contains Info for Key Map settings
 **
-**     $Id: keymapsettings.cpp,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
 */
 /* ========================================================================= */
@@ -34,6 +35,8 @@
 #include <gtkmm/accelmap.h>
 #include <gtk/gtkaccelmap.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -77,7 +80,7 @@ bool KeyMapSettings::set_key(const char *path, guint key, Gdk::ModifierType mod,
        }
 }
 
-bool KeyMapSettings::get_key(const char *path, AccelKey *key)
+bool KeyMapSettings::get_key(const char *path, Gtk::AccelKey *key)
 {
        GtkAccelKey     ac;
        if(gtk_accel_map_lookup_entry(path,&ac))
@@ -85,7 +88,7 @@ bool KeyMapSettings::get_key(const char *path, AccelKey *key)
                *key = AccelKey(ac.accel_key,(Gdk::ModifierType)ac.accel_mods,string(path));
                return true;
        }
-       
+
        return false;
 }
 
@@ -93,18 +96,18 @@ bool KeyMapSettings::load(const char *filename)
 {
        string n(filename);
        n += ".skm";
-       
+
        AccelMap::load(filename);
-       
-       return true;    
+
+       return true;
 }
 
 bool KeyMapSettings::save(const char *filename)
 {
        string n(filename);
        n += ".skm";
-       
+
        AccelMap::save(filename);
-       
+
        return true;
 }