Skip to content

Commit aaaf5e6

Browse files
author
jef
committed
fix python binding compile error
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10742 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 20f22b0 commit aaaf5e6

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

python/gui/qgisinterface.sip

+12-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ class QgisInterface : QObject
8989
/** Add a dock widget to the main window */
9090
virtual void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget )=0;
9191

92-
/** Remove specified dock widget from main window (doesn't delete it). Added in QGIS 1.1. */
93-
virtual void removeDockWidget ( QDockWidget * dockwidget )=0;
92+
/** Remove specified dock widget from main window (doesn't delete it). Added in QGIS 1.1. */
93+
virtual void removeDockWidget ( QDockWidget * dockwidget )=0;
9494

9595
/** refresh legend of a layer */
9696
virtual void refreshLegend( QgsMapLayer * layer )=0;
@@ -102,6 +102,16 @@ class QgisInterface : QObject
102102
* windows which are hidden rather than deleted when closed. */
103103
virtual void removeWindow( QAction *action ) = 0;
104104

105+
/** Register action to the shortcuts manager so its shortcut can be changed in GUI
106+
\note added in 1.2
107+
*/
108+
virtual bool registerMainWindowAction( QAction* action, QString defaultShortcut ) = 0;
109+
110+
/** Unregister a previously registered action. (e.g. when plugin is going to be unloaded)
111+
\note added in 1.2
112+
*/
113+
virtual bool unregisterMainWindowAction( QAction* action ) = 0;
114+
105115
/** Accessors for inserting items into menus and toolbars.
106116
* An item can be inserted before any existing action.
107117
*/

src/gui/qgisinterface.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,14 @@ class GUI_EXPORT QgisInterface : public QObject
135135
* windows which are hidden rather than deleted when closed. */
136136
virtual void removeWindow( QAction *action ) = 0;
137137

138-
/** Register action to the shortcuts manager so its shortcut can be changed in GUI */
138+
/** Register action to the shortcuts manager so its shortcut can be changed in GUI
139+
\note added in 1.2
140+
*/
139141
virtual bool registerMainWindowAction( QAction* action, QString defaultShortcut ) = 0;
140142

141-
/** Unregister a previously registered action. (e.g. when plugin is going to be unloaded */
143+
/** Unregister a previously registered action. (e.g. when plugin is going to be unloaded)
144+
\note added in 1.2
145+
*/
142146
virtual bool unregisterMainWindowAction( QAction* action ) = 0;
143147

144148
// TODO: is this deprecated in favour of QgsContextHelp?

0 commit comments

Comments
 (0)