[QGIS Commit] r10742 - in trunk/qgis: python/gui src/gui

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-05-05 17:52:46 -0400 (Tue, 05 May 2009)
New Revision: 10742

Modified:
   trunk/qgis/python/gui/qgisinterface.sip
   trunk/qgis/src/gui/qgisinterface.h
Log:
fix python binding compile error

Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip	2009-05-05 18:46:21 UTC (rev 10741)
+++ trunk/qgis/python/gui/qgisinterface.sip	2009-05-05 21:52:46 UTC (rev 10742)
@@ -89,8 +89,8 @@
     /** 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 @@
      * 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.
      */

Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h	2009-05-05 18:46:21 UTC (rev 10741)
+++ trunk/qgis/src/gui/qgisinterface.h	2009-05-05 21:52:46 UTC (rev 10742)
@@ -135,10 +135,14 @@
      * 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?