Skip to content

Commit cba8265

Browse files
nyalldawsonnyalldawson
committed
[composer] Fix invalid signal connection
1 parent a6c88c1 commit cba8265

11 files changed

+22
-22
lines changed

‎src/app/composer/qgscomposerattributetablewidget.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ QgsComposerAttributeTableWidget::QgsComposerAttributeTableWidget( QgsComposerAtt
6363

6464
mComposerMapComboBox->setComposition( mComposerTable->composition() );
6565
mComposerMapComboBox->setItemType( QgsComposerItem::ComposerMap );
66-
connect( mComposerMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );
66+
connect( mComposerMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );
6767

6868
mHeaderFontColorButton->setColorDialogTitle( tr( "Select header font color" ) );
6969
mHeaderFontColorButton->setAllowAlpha( true );

‎src/app/composer/qgscomposerlegendwidget.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend )
6666

6767
mMapComboBox->setComposition( legend->composition() );
6868
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* ) ) );
7070

7171
//add widget for item properties
7272
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend );
@@ -549,7 +549,7 @@ void QgsComposerLegendWidget::on_mCheckBoxAutoUpdate_stateChanged( int state )
549549
}
550550
}
551551

552-
void QgsComposerLegendWidget::composerMapChanged( const QgsComposerItem* item )
552+
void QgsComposerLegendWidget::composerMapChanged( QgsComposerItem* item )
553553
{
554554
if ( !mLegend )
555555
{
@@ -562,7 +562,7 @@ void QgsComposerLegendWidget::composerMapChanged( const QgsComposerItem* item )
562562
return;
563563
}
564564

565-
const QgsComposerMap* map = dynamic_cast< const QgsComposerMap* >( item );
565+
QgsComposerMap* map = dynamic_cast< QgsComposerMap* >( item );
566566
if ( map )
567567
{
568568
mLegend->beginCommand( tr( "Legend map changed" ) );

‎src/app/composer/qgscomposerlegendwidget.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class QgsComposerLegendWidget: public QgsComposerItemBaseWidget, private Ui::Qgs
6767
void on_mBoxSpaceSpinBox_valueChanged( double d );
6868
void on_mColumnSpaceSpinBox_valueChanged( double d );
6969
void on_mCheckBoxAutoUpdate_stateChanged( int state );
70-
void composerMapChanged( const QgsComposerItem* item );
70+
void composerMapChanged( QgsComposerItem* item );
7171

7272
void on_mRasterBorderGroupBox_toggled( bool state );
7373
void on_mRasterBorderWidthSpinBox_valueChanged( double d );

‎src/app/composer/qgscomposermapwidget.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap )
156156
mOverviewFrameMapComboBox->setComposition( composerMap->composition() );
157157
mOverviewFrameMapComboBox->setItemType( QgsComposerItem::ComposerMap );
158158
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* ) ) );
160160
}
161161

162162
//connections for data defined buttons
@@ -2458,15 +2458,15 @@ void QgsComposerMapWidget::on_mOverviewCheckBox_toggled( bool state )
24582458
mComposerMap->endCommand();
24592459
}
24602460

2461-
void QgsComposerMapWidget::overviewMapChanged( const QgsComposerItem* item )
2461+
void QgsComposerMapWidget::overviewMapChanged( QgsComposerItem* item )
24622462
{
24632463
QgsComposerMapOverview* overview = currentOverview();
24642464
if ( !overview )
24652465
{
24662466
return;
24672467
}
24682468

2469-
const QgsComposerMap* map = dynamic_cast< const QgsComposerMap* >( item );
2469+
QgsComposerMap* map = dynamic_cast< QgsComposerMap* >( item );
24702470
if ( !map )
24712471
return;
24722472

‎src/app/composer/qgscomposermapwidget.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
4646
void on_mKeepLayerListCheckBox_stateChanged( int state );
4747
void on_mKeepLayerStylesCheckBox_stateChanged( int state );
4848
void on_mDrawCanvasItemsCheckBox_stateChanged( int state );
49-
void overviewMapChanged( const QgsComposerItem* item );
49+
void overviewMapChanged( QgsComposerItem* item );
5050
void on_mOverviewFrameStyleButton_clicked();
5151
void on_mOverviewBlendModeComboBox_currentIndexChanged( int index );
5252
void on_mOverviewInvertCheckbox_toggled( bool state );

‎src/app/composer/qgscomposerpicturewidget.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture
5252
{
5353
mComposerMapComboBox->setComposition( mPicture->composition() );
5454
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* ) ) );
5656
}
5757

5858
setGuiElementValues();
@@ -293,7 +293,7 @@ void QgsComposerPictureWidget::on_mRotationFromComposerMapCheckBox_stateChanged(
293293
mPicture->endCommand();
294294
}
295295

296-
void QgsComposerPictureWidget::composerMapChanged( const QgsComposerItem* item )
296+
void QgsComposerPictureWidget::composerMapChanged( QgsComposerItem* item )
297297
{
298298
if ( !mPicture )
299299
{
@@ -307,7 +307,7 @@ void QgsComposerPictureWidget::composerMapChanged( const QgsComposerItem* item )
307307
return;
308308
}
309309

310-
const QgsComposerMap* composerMap = dynamic_cast< const QgsComposerMap*>( item );
310+
QgsComposerMap* composerMap = dynamic_cast< QgsComposerMap*>( item );
311311
int id = composerMap ? composerMap->id() : -1;
312312
if ( !composerMap )
313313
{

‎src/app/composer/qgscomposerpicturewidget.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class QgsComposerPictureWidget: public QgsComposerItemBaseWidget, private Ui::Qg
4545
void on_mAddDirectoryButton_clicked();
4646
void on_mRemoveDirectoryButton_clicked();
4747
void on_mRotationFromComposerMapCheckBox_stateChanged( int state );
48-
void composerMapChanged( const QgsComposerItem* item );
48+
void composerMapChanged( QgsComposerItem* item );
4949
void on_mResizeModeComboBox_currentIndexChanged( int index );
5050
void on_mAnchorPointComboBox_currentIndexChanged( int index );
5151

‎src/app/composer/qgscomposerscalebarwidget.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale
8686
mMapItemComboBox->setItemType( QgsComposerItem::ComposerMap );
8787
}
8888

89-
connect( mMapItemComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) );
89+
connect( mMapItemComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( QgsComposerItem* ) ) );
9090

9191
blockMemberSignals( false );
9292
setGuiElements(); //set the GUI elements to the state of scaleBar
@@ -630,9 +630,9 @@ void QgsComposerScaleBarWidget::segmentSizeRadioChanged( QAbstractButton* radio
630630
mComposerScaleBar->endCommand();
631631
}
632632

633-
void QgsComposerScaleBarWidget::composerMapChanged( const QgsComposerItem* item )
633+
void QgsComposerScaleBarWidget::composerMapChanged( QgsComposerItem* item )
634634
{
635-
const QgsComposerMap* composerMap = dynamic_cast< const QgsComposerMap* >( item );
635+
QgsComposerMap* composerMap = dynamic_cast< QgsComposerMap* >( item );
636636
if ( !composerMap )
637637
{
638638
return;

‎src/app/composer/qgscomposerscalebarwidget.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class QgsComposerScaleBarWidget: public QgsComposerItemBaseWidget, private Ui::Q
6060
private slots:
6161
void setGuiElements();
6262
void segmentSizeRadioChanged( QAbstractButton*radio );
63-
void composerMapChanged( const QgsComposerItem* item );
63+
void composerMapChanged( QgsComposerItem* item );
6464

6565
private:
6666
QgsComposerScaleBar* mComposerScaleBar;

‎src/app/composer/qgscompositionwidget.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
123123
connect( mPaperOrientationDDBtn, SIGNAL( dataDefinedActivated( bool ) ), this, SLOT( updateDataDefinedProperty() ) );
124124
connect( mPaperOrientationDDBtn, SIGNAL( dataDefinedActivated( bool ) ), mPaperOrientationComboBox, SLOT( setDisabled( bool ) ) );
125125

126-
connect( mWorldFileMapComboBox, SIGNAL( itemChanged( const QgsComposerItem* ) ), this, SLOT( worldFileMapChanged( const QgsComposerItem* ) ) );
126+
connect( mWorldFileMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( worldFileMapChanged( QgsComposerItem* ) ) );
127127

128128
//initialize data defined buttons
129129
populateDataDefinedButtons();
@@ -661,15 +661,15 @@ void QgsCompositionWidget::on_mGenerateWorldFileCheckBox_toggled( bool state )
661661
mWorldFileMapComboBox->setEnabled( state );
662662
}
663663

664-
void QgsCompositionWidget::worldFileMapChanged( const QgsComposerItem* item )
664+
void QgsCompositionWidget::worldFileMapChanged( QgsComposerItem* item )
665665
{
666666
if ( !mComposition )
667667
{
668668
return;
669669
}
670670

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 );
673673
}
674674

675675
void QgsCompositionWidget::on_mGridResolutionSpinBox_valueChanged( double d )

0 commit comments

Comments
 (0)