[QGIS Commit] r14743 - in trunk/qgis: python/gui src/app/composer src/gui

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-11-22 14:32:03 -0800 (Mon, 22 Nov 2010)
New Revision: 14743

Modified:
   trunk/qgis/python/gui/qgscomposerview.sip
   trunk/qgis/src/app/composer/qgscomposer.cpp
   trunk/qgis/src/gui/qgscomposerview.h
Log:
Make signal QgsComposerView::selectedItemChanged with non-const pointer to avoid problems with some PyQt versions


Modified: trunk/qgis/python/gui/qgscomposerview.sip
===================================================================
--- trunk/qgis/python/gui/qgscomposerview.sip	2010-11-22 21:42:11 UTC (rev 14742)
+++ trunk/qgis/python/gui/qgscomposerview.sip	2010-11-22 22:32:03 UTC (rev 14743)
@@ -83,7 +83,7 @@
 
   signals:
     /**Is emitted when selected item changed. If 0, no item is selected*/
-    void selectedItemChanged( const QgsComposerItem* selected );
+    void selectedItemChanged( QgsComposerItem* selected );
     /**Ist emittted when new composer label has been added to the view*/
     void composerLabelAdded( QgsComposerLabel* label );
     /**Is emitted when new composer map has been added to the view*/

Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp	2010-11-22 21:42:11 UTC (rev 14742)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp	2010-11-22 22:32:03 UTC (rev 14743)
@@ -275,7 +275,7 @@
 
 void QgsComposer::connectSlots()
 {
-  connect( mView, SIGNAL( selectedItemChanged( const QgsComposerItem* ) ), this, SLOT( showItemOptions( const QgsComposerItem* ) ) );
+  connect( mView, SIGNAL( selectedItemChanged( QgsComposerItem* ) ), this, SLOT( showItemOptions( QgsComposerItem* ) ) );
   connect( mView, SIGNAL( composerLabelAdded( QgsComposerLabel* ) ), this, SLOT( addComposerLabel( QgsComposerLabel* ) ) );
   connect( mView, SIGNAL( composerMapAdded( QgsComposerMap* ) ), this, SLOT( addComposerMap( QgsComposerMap* ) ) );
   connect( mView, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( deleteItem( QgsComposerItem* ) ) );

Modified: trunk/qgis/src/gui/qgscomposerview.h
===================================================================
--- trunk/qgis/src/gui/qgscomposerview.h	2010-11-22 21:42:11 UTC (rev 14742)
+++ trunk/qgis/src/gui/qgscomposerview.h	2010-11-22 22:32:03 UTC (rev 14743)
@@ -131,7 +131,7 @@
 
   signals:
     /**Is emitted when selected item changed. If 0, no item is selected*/
-    void selectedItemChanged( const QgsComposerItem* selected );
+    void selectedItemChanged( QgsComposerItem* selected );
     /**Is emitted when new composer arrow has been added to the view*/
     void composerArrowAdded( QgsComposerArrow* arrow );
     /**Is emitted when new composer label has been added to the view*/