[composer] Fix invalid signal connection

nyalldawson · nyalldawson · commit cba82658e48d · 2016-05-03T08:01:35.000+10:00
diff --git a/src/app/composer/qgscomposerattributetablewidget.cpp b/src/app/composer/qgscomposerattributetablewidget.cpp
@@ -63,7 +63,7 @@ QgsComposerAttributeTableWidget::QgsComposerAttributeTableWidget( QgsComposerAtt
 
   mComposerMapComboBox->setComposition( mComposerTable->composition() );
   mComposerMapComboBox->setItemType( QgsComposerItem::ComposerMap );
-  connect( mComposerMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );
+  connect( mComposerMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );
 
   mHeaderFontColorButton->setColorDialogTitle( tr( "Select header font color" ) );
   mHeaderFontColorButton->setAllowAlpha( true );
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -66,7 +66,7 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend )
 
   mMapComboBox->setComposition( legend->composition() );
   mMapComboBox->setItemType( QgsComposerItem::ComposerMap );
-  connect( mMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );
+  connect( mMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( QgsComposerItem* ) ) );
 
   //add widget for item properties
   QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend );
@@ -549,7 +549,7 @@ void QgsComposerLegendWidget::on_mCheckBoxAutoUpdate_stateChanged( int state )
   }
 }
 
-void QgsComposerLegendWidget::composerMapChanged( const QgsComposerItem* item )
+void QgsComposerLegendWidget::composerMapChanged( QgsComposerItem* item )
 {
   if ( !mLegend )
   {
@@ -562,7 +562,7 @@ void QgsComposerLegendWidget::composerMapChanged( const QgsComposerItem* item )
     return;
   }
 
-  const QgsComposerMap* map = dynamic_cast< const QgsComposerMap* >( item );
+  QgsComposerMap* map = dynamic_cast< QgsComposerMap* >( item );
   if ( map )
   {
     mLegend->beginCommand( tr( "Legend map changed" ) );
diff --git a/src/app/composer/qgscomposerlegendwidget.h b/src/app/composer/qgscomposerlegendwidget.h
@@ -67,7 +67,7 @@ class QgsComposerLegendWidget: public QgsComposerItemBaseWidget, private Ui::Qgs
     void on_mBoxSpaceSpinBox_valueChanged( double d );
     void on_mColumnSpaceSpinBox_valueChanged( double d );
     void on_mCheckBoxAutoUpdate_stateChanged( int state );
-    void composerMapChanged( const QgsComposerItem* item );
+    void composerMapChanged( QgsComposerItem* item );
 
     void on_mRasterBorderGroupBox_toggled( bool state );
     void on_mRasterBorderWidthSpinBox_valueChanged( double d );
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -156,7 +156,7 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap )
     mOverviewFrameMapComboBox->setComposition( composerMap->composition() );
     mOverviewFrameMapComboBox->setItemType( QgsComposerItem::ComposerMap );
     mOverviewFrameMapComboBox->setExceptedItemList( QList< QgsComposerItem* >() << composerMap );
-    connect( mOverviewFrameMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( overviewMapChanged( const QgsComposerItem* ) ) );
+    connect( mOverviewFrameMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( overviewMapChanged( QgsComposerItem* ) ) );
   }
 
   //connections for data defined buttons
@@ -2458,15 +2458,15 @@ void QgsComposerMapWidget::on_mOverviewCheckBox_toggled( bool state )
   mComposerMap->endCommand();
 }
 
-void QgsComposerMapWidget::overviewMapChanged( const QgsComposerItem* item )
+void QgsComposerMapWidget::overviewMapChanged( QgsComposerItem* item )
 {
   QgsComposerMapOverview* overview = currentOverview();
   if ( !overview )
   {
     return;
   }
 
-  const QgsComposerMap* map = dynamic_cast< const QgsComposerMap* >( item );
+  QgsComposerMap* map = dynamic_cast< QgsComposerMap* >( item );
   if ( !map )
     return;
 
diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h
@@ -46,7 +46,7 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
     void on_mKeepLayerListCheckBox_stateChanged( int state );
     void on_mKeepLayerStylesCheckBox_stateChanged( int state );
     void on_mDrawCanvasItemsCheckBox_stateChanged( int state );
-    void overviewMapChanged( const QgsComposerItem* item );
+    void overviewMapChanged( QgsComposerItem* item );
     void on_mOverviewFrameStyleButton_clicked();
     void on_mOverviewBlendModeComboBox_currentIndexChanged( int index );
     void on_mOverviewInvertCheckbox_toggled( bool state );
diff --git a/src/app/composer/qgscomposerpicturewidget.cpp b/src/app/composer/qgscomposerpicturewidget.cpp
@@ -52,7 +52,7 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture
   {
     mComposerMapComboBox->setComposition( mPicture->composition() );
     mComposerMapComboBox->setItemType( QgsComposerItem::ComposerMap );
-    connect( mComposerMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );
+    connect( mComposerMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( QgsComposerItem* ) ) );
   }
 
   setGuiElementValues();
@@ -293,7 +293,7 @@ void QgsComposerPictureWidget::on_mRotationFromComposerMapCheckBox_stateChanged(
   mPicture->endCommand();
 }
 
-void QgsComposerPictureWidget::composerMapChanged( const QgsComposerItem* item )
+void QgsComposerPictureWidget::composerMapChanged( QgsComposerItem* item )
 {
   if ( !mPicture )
   {
@@ -307,7 +307,7 @@ void QgsComposerPictureWidget::composerMapChanged( const QgsComposerItem* item )
     return;
   }
 
-  const QgsComposerMap* composerMap = dynamic_cast< const QgsComposerMap*>( item );
+  QgsComposerMap* composerMap = dynamic_cast< QgsComposerMap*>( item );
   int id = composerMap ? composerMap->id() : -1;
   if ( !composerMap )
   {
diff --git a/src/app/composer/qgscomposerpicturewidget.h b/src/app/composer/qgscomposerpicturewidget.h
@@ -45,7 +45,7 @@ class QgsComposerPictureWidget: public QgsComposerItemBaseWidget, private Ui::Qg
     void on_mAddDirectoryButton_clicked();
     void on_mRemoveDirectoryButton_clicked();
     void on_mRotationFromComposerMapCheckBox_stateChanged( int state );
-    void composerMapChanged( const QgsComposerItem* item );
+    void composerMapChanged( QgsComposerItem* item );
     void on_mResizeModeComboBox_currentIndexChanged( int index );
     void on_mAnchorPointComboBox_currentIndexChanged( int index );
 
diff --git a/src/app/composer/qgscomposerscalebarwidget.cpp b/src/app/composer/qgscomposerscalebarwidget.cpp
@@ -86,7 +86,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale
     mMapItemComboBox->setItemType( QgsComposerItem::ComposerMap );
   }
 
-  connect( mMapItemComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );
+  connect( mMapItemComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( QgsComposerItem* ) ) );
 
   blockMemberSignals( false );
   setGuiElements(); //set the GUI elements to the state of scaleBar
@@ -630,9 +630,9 @@ void QgsComposerScaleBarWidget::segmentSizeRadioChanged( QAbstractButton* radio
   mComposerScaleBar->endCommand();
 }
 
-void QgsComposerScaleBarWidget::composerMapChanged( const QgsComposerItem* item )
+void QgsComposerScaleBarWidget::composerMapChanged( QgsComposerItem* item )
 {
-  const QgsComposerMap* composerMap = dynamic_cast< const QgsComposerMap* >( item );
+  QgsComposerMap* composerMap = dynamic_cast< QgsComposerMap* >( item );
   if ( !composerMap )
   {
     return;
diff --git a/src/app/composer/qgscomposerscalebarwidget.h b/src/app/composer/qgscomposerscalebarwidget.h
@@ -60,7 +60,7 @@ class QgsComposerScaleBarWidget: public QgsComposerItemBaseWidget, private Ui::Q
   private slots:
     void setGuiElements();
     void segmentSizeRadioChanged( QAbstractButton*radio );
-    void composerMapChanged( const QgsComposerItem* item );
+    void composerMapChanged( QgsComposerItem* item );
 
   private:
     QgsComposerScaleBar* mComposerScaleBar;
diff --git a/src/app/composer/qgscompositionwidget.cpp b/src/app/composer/qgscompositionwidget.cpp
@@ -123,7 +123,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
   connect( mPaperOrientationDDBtn, SIGNAL( dataDefinedActivated( bool ) ), this, SLOT( updateDataDefinedProperty() ) );
   connect( mPaperOrientationDDBtn, SIGNAL( dataDefinedActivated( bool ) ), mPaperOrientationComboBox, SLOT( setDisabled( bool ) ) );
 
-  connect( mWorldFileMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( worldFileMapChanged( const QgsComposerItem* ) ) );
+  connect( mWorldFileMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( worldFileMapChanged( QgsComposerItem* ) ) );
 
   //initialize data defined buttons
   populateDataDefinedButtons();
@@ -661,15 +661,15 @@ void QgsCompositionWidget::on_mGenerateWorldFileCheckBox_toggled( bool state )
   mWorldFileMapComboBox->setEnabled( state );
 }
 
-void QgsCompositionWidget::worldFileMapChanged( const QgsComposerItem* item )
+void QgsCompositionWidget::worldFileMapChanged( QgsComposerItem* item )
 {
   if ( !mComposition )
   {
     return;
   }
 
-  const QgsComposerMap* map = dynamic_cast< const QgsComposerMap* >( item );
-  mComposition->setWorldFileMap( const_cast< QgsComposerMap* >( map ) );
+  QgsComposerMap* map = dynamic_cast< QgsComposerMap* >( item );
+  mComposition->setWorldFileMap( map );
 }
 
 void QgsCompositionWidget::on_mGridResolutionSpinBox_valueChanged( double d )
diff --git a/src/app/composer/qgscompositionwidget.h b/src/app/composer/qgscompositionwidget.h
@@ -54,7 +54,7 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
     void on_mResolutionSpinBox_valueChanged( const int value );
     void on_mPrintAsRasterCheckBox_toggled( bool state );
     void on_mGenerateWorldFileCheckBox_toggled( bool state );
-    void worldFileMapChanged( const QgsComposerItem* );
+    void worldFileMapChanged( QgsComposerItem* );
 
     void on_mGridResolutionSpinBox_valueChanged( double d );
     void on_mOffsetXSpinBox_valueChanged( double d );

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend )`
`66`	`66`
`67`	`67`	`mMapComboBox->setComposition( legend->composition() );`
`68`	`68`	`mMapComboBox->setItemType( QgsComposerItem::ComposerMap );`
`69`		`- connect( mMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );`
	`69`	`+ connect( mMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( QgsComposerItem* ) ) );`
`70`	`70`
`71`	`71`	`//add widget for item properties`
`72`	`72`	`QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend );`
`@@ -549,7 +549,7 @@ void QgsComposerLegendWidget::on_mCheckBoxAutoUpdate_stateChanged( int state )`
`549`	`549`	`}`
`550`	`550`	`}`
`551`	`551`
`552`		`-void QgsComposerLegendWidget::composerMapChanged( const QgsComposerItem* item )`
	`552`	`+void QgsComposerLegendWidget::composerMapChanged( QgsComposerItem* item )`
`553`	`553`	`{`
`554`	`554`	`if ( !mLegend )`
`555`	`555`	`{`
`@@ -562,7 +562,7 @@ void QgsComposerLegendWidget::composerMapChanged( const QgsComposerItem* item )`
`562`	`562`	`return;`
`563`	`563`	`}`
`564`	`564`
`565`		`- const QgsComposerMap* map = dynamic_cast< const QgsComposerMap* >( item );`
	`565`	`+ QgsComposerMap* map = dynamic_cast< QgsComposerMap* >( item );`
`566`	`566`	`if ( map )`
`567`	`567`	`{`
`568`	`568`	`mLegend->beginCommand( tr( "Legend map changed" ) );`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap )`
`156`	`156`	`mOverviewFrameMapComboBox->setComposition( composerMap->composition() );`
`157`	`157`	`mOverviewFrameMapComboBox->setItemType( QgsComposerItem::ComposerMap );`
`158`	`158`	`mOverviewFrameMapComboBox->setExceptedItemList( QList< QgsComposerItem* >() << composerMap );`
`159`		`- connect( mOverviewFrameMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( overviewMapChanged( const QgsComposerItem* ) ) );`
	`159`	`+ connect( mOverviewFrameMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( overviewMapChanged( QgsComposerItem* ) ) );`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`//connections for data defined buttons`
`@@ -2458,15 +2458,15 @@ void QgsComposerMapWidget::on_mOverviewCheckBox_toggled( bool state )`
`2458`	`2458`	`mComposerMap->endCommand();`
`2459`	`2459`	`}`
`2460`	`2460`
`2461`		`-void QgsComposerMapWidget::overviewMapChanged( const QgsComposerItem* item )`
	`2461`	`+void QgsComposerMapWidget::overviewMapChanged( QgsComposerItem* item )`
`2462`	`2462`	`{`
`2463`	`2463`	`QgsComposerMapOverview* overview = currentOverview();`
`2464`	`2464`	`if ( !overview )`
`2465`	`2465`	`{`
`2466`	`2466`	`return;`
`2467`	`2467`	`}`
`2468`	`2468`
`2469`		`- const QgsComposerMap* map = dynamic_cast< const QgsComposerMap* >( item );`
	`2469`	`+ QgsComposerMap* map = dynamic_cast< QgsComposerMap* >( item );`
`2470`	`2470`	`if ( !map )`
`2471`	`2471`	`return;`
`2472`	`2472`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture`
`52`	`52`	`{`
`53`	`53`	`mComposerMapComboBox->setComposition( mPicture->composition() );`
`54`	`54`	`mComposerMapComboBox->setItemType( QgsComposerItem::ComposerMap );`
`55`		`- connect( mComposerMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );`
	`55`	`+ connect( mComposerMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( QgsComposerItem* ) ) );`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`setGuiElementValues();`
`@@ -293,7 +293,7 @@ void QgsComposerPictureWidget::on_mRotationFromComposerMapCheckBox_stateChanged(`
`293`	`293`	`mPicture->endCommand();`
`294`	`294`	`}`
`295`	`295`
`296`		`-void QgsComposerPictureWidget::composerMapChanged( const QgsComposerItem* item )`
	`296`	`+void QgsComposerPictureWidget::composerMapChanged( QgsComposerItem* item )`
`297`	`297`	`{`
`298`	`298`	`if ( !mPicture )`
`299`	`299`	`{`
`@@ -307,7 +307,7 @@ void QgsComposerPictureWidget::composerMapChanged( const QgsComposerItem* item )`
`307`	`307`	`return;`
`308`	`308`	`}`
`309`	`309`
`310`		`- const QgsComposerMap* composerMap = dynamic_cast< const QgsComposerMap*>( item );`
	`310`	`+ QgsComposerMap* composerMap = dynamic_cast< QgsComposerMap*>( item );`
`311`	`311`	`int id = composerMap ? composerMap->id() : -1;`
`312`	`312`	`if ( !composerMap )`
`313`	`313`	`{`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale`
`86`	`86`	`mMapItemComboBox->setItemType( QgsComposerItem::ComposerMap );`
`87`	`87`	`}`
`88`	`88`
`89`		`- connect( mMapItemComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );`
	`89`	`+ connect( mMapItemComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( QgsComposerItem* ) ) );`
`90`	`90`
`91`	`91`	`blockMemberSignals( false );`
`92`	`92`	`setGuiElements(); //set the GUI elements to the state of scaleBar`
`@@ -630,9 +630,9 @@ void QgsComposerScaleBarWidget::segmentSizeRadioChanged( QAbstractButton* radio`
`630`	`630`	`mComposerScaleBar->endCommand();`
`631`	`631`	`}`
`632`	`632`
`633`		`-void QgsComposerScaleBarWidget::composerMapChanged( const QgsComposerItem* item )`
	`633`	`+void QgsComposerScaleBarWidget::composerMapChanged( QgsComposerItem* item )`
`634`	`634`	`{`
`635`		`- const QgsComposerMap* composerMap = dynamic_cast< const QgsComposerMap* >( item );`
	`635`	`+ QgsComposerMap* composerMap = dynamic_cast< QgsComposerMap* >( item );`
`636`	`636`	`if ( !composerMap )`
`637`	`637`	`{`
`638`	`638`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )`
`123`	`123`	`connect( mPaperOrientationDDBtn, SIGNAL( dataDefinedActivated( bool ) ), this, SLOT( updateDataDefinedProperty() ) );`
`124`	`124`	`connect( mPaperOrientationDDBtn, SIGNAL( dataDefinedActivated( bool ) ), mPaperOrientationComboBox, SLOT( setDisabled( bool ) ) );`
`125`	`125`
`126`		`- connect( mWorldFileMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( worldFileMapChanged( const QgsComposerItem* ) ) );`
	`126`	`+ connect( mWorldFileMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( worldFileMapChanged( QgsComposerItem* ) ) );`
`127`	`127`
`128`	`128`	`//initialize data defined buttons`
`129`	`129`	`populateDataDefinedButtons();`
`@@ -661,15 +661,15 @@ void QgsCompositionWidget::on_mGenerateWorldFileCheckBox_toggled( bool state )`
`661`	`661`	`mWorldFileMapComboBox->setEnabled( state );`
`662`	`662`	`}`
`663`	`663`
`664`		`-void QgsCompositionWidget::worldFileMapChanged( const QgsComposerItem* item )`
	`664`	`+void QgsCompositionWidget::worldFileMapChanged( QgsComposerItem* item )`
`665`	`665`	`{`
`666`	`666`	`if ( !mComposition )`
`667`	`667`	`{`
`668`	`668`	`return;`
`669`	`669`	`}`
`670`	`670`
`671`		`- const QgsComposerMap* map = dynamic_cast< const QgsComposerMap* >( item );`
`672`		`- mComposition->setWorldFileMap( const_cast< QgsComposerMap* >( map ) );`
	`671`	`+ QgsComposerMap* map = dynamic_cast< QgsComposerMap* >( item );`
	`672`	`+ mComposition->setWorldFileMap( map );`
`673`	`673`	`}`
`674`	`674`
`675`	`675`	`void QgsCompositionWidget::on_mGridResolutionSpinBox_valueChanged( double d )`