From 5cf339567345fc7e0e29a90b086ec3b87f3c341a Mon Sep 17 00:00:00 2001
From: jef <jef@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Tue, 5 May 2009 21:52:46 +0000
Subject: [PATCH] fix python binding compile error

git-svn-id: http://svn.osgeo.org/qgis/trunk@10742 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 python/gui/qgisinterface.sip | 14 ++++++++++++--
 src/gui/qgisinterface.h      |  8 ++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip
index 5ffb818859e..26d03ad4760 100644
--- a/python/gui/qgisinterface.sip
+++ b/python/gui/qgisinterface.sip
@@ -89,8 +89,8 @@ class QgisInterface : QObject
     /** Add a dock widget to the main window */
     virtual void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget )=0;
 
-	/** Remove specified dock widget from main window (doesn't delete it). Added in QGIS 1.1. */
-	virtual void removeDockWidget ( QDockWidget * dockwidget )=0;
+    /** Remove specified dock widget from main window (doesn't delete it). Added in QGIS 1.1. */
+    virtual void removeDockWidget ( QDockWidget * dockwidget )=0;
 
     /** refresh legend of a layer */
     virtual void refreshLegend( QgsMapLayer * layer )=0;
@@ -102,6 +102,16 @@ class QgisInterface : QObject
      * windows which are hidden rather than deleted when closed. */
     virtual void removeWindow( QAction *action ) = 0;
 
+    /** Register action to the shortcuts manager so its shortcut can be changed in GUI
+       \note added in 1.2
+    */
+    virtual bool registerMainWindowAction( QAction* action, QString defaultShortcut ) = 0;
+
+    /** Unregister a previously registered action. (e.g. when plugin is going to be unloaded)
+       \note added in 1.2
+    */
+    virtual bool unregisterMainWindowAction( QAction* action ) = 0;
+
     /** Accessors for inserting items into menus and toolbars.
      * An item can be inserted before any existing action.
      */
diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h
index 5379cf285f4..ca40807b0b5 100644
--- a/src/gui/qgisinterface.h
+++ b/src/gui/qgisinterface.h
@@ -135,10 +135,14 @@ class GUI_EXPORT QgisInterface : public QObject
      * windows which are hidden rather than deleted when closed. */
     virtual void removeWindow( QAction *action ) = 0;
 
-    /** Register action to the shortcuts manager so its shortcut can be changed in GUI */
+    /** Register action to the shortcuts manager so its shortcut can be changed in GUI
+      \note added in 1.2
+    */
     virtual bool registerMainWindowAction( QAction* action, QString defaultShortcut ) = 0;
 
-    /** Unregister a previously registered action. (e.g. when plugin is going to be unloaded */
+    /** Unregister a previously registered action. (e.g. when plugin is going to be unloaded)
+      \note added in 1.2
+    */
     virtual bool unregisterMainWindowAction( QAction* action ) = 0;
 
     // TODO: is this deprecated in favour of QgsContextHelp?