sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-26 00:02:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3647 from nirvn/composer_attribute_table_fix

Browse Source 
[composer] fix attribute table widget connect warning
This commit is contained in:
Nyall Dawson 2016-10-20 18:19:44 +10:00 committed by GitHub
commit 2d4e3da8f5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/composer/qgscomposerattributetablewidget.cpp
View File

@ -66,7 +66,7 @@ QgsComposerAttributeTableWidget::QgsComposerAttributeTableWidget( QgsComposerAtt
mComposerMapComboBox->setComposition( mComposerTable->composition() ); mComposerMapComboBox->setComposition( mComposerTable->composition() );
mComposerMapComboBox->setItemType( QgsComposerItem::ComposerMap ); mComposerMapComboBox->setItemType( QgsComposerItem::ComposerMap );
connect( mComposerMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( const QgsComposerItem* ) ) ); connect( mComposerMapComboBox, SIGNAL( itemChanged( QgsComposerItem* ) ), this, SLOT( composerMapChanged( QgsComposerItem* ) ) );
mHeaderFontColorButton->setColorDialogTitle( tr( "Select header font color" ) ); mHeaderFontColorButton->setColorDialogTitle( tr( "Select header font color" ) );
mHeaderFontColorButton->setAllowAlpha( true ); mHeaderFontColorButton->setAllowAlpha( true );
@ -176,7 +176,7 @@ void QgsComposerAttributeTableWidget::on_mAttributesPushButton_clicked()
} }
} }
void QgsComposerAttributeTableWidget::composerMapChanged( const QgsComposerItem* item ) void QgsComposerAttributeTableWidget::composerMapChanged( QgsComposerItem* item )
{ {
if ( !mComposerTable ) if ( !mComposerTable )
{ {

2
src/app/composer/qgscomposerattributetablewidget.h
View File

@ -45,7 +45,7 @@ class QgsComposerAttributeTableWidget: public QgsComposerItemBaseWidget, private
private slots: private slots:
void on_mRefreshPushButton_clicked(); void on_mRefreshPushButton_clicked();
void on_mAttributesPushButton_clicked(); void on_mAttributesPushButton_clicked();
void composerMapChanged( const QgsComposerItem* item ); void composerMapChanged( QgsComposerItem* item );
void on_mMaximumRowsSpinBox_valueChanged( int i ); void on_mMaximumRowsSpinBox_valueChanged( int i );
void on_mMarginSpinBox_valueChanged( double d ); void on_mMarginSpinBox_valueChanged( double d );
void on_mGridStrokeWidthSpinBox_valueChanged( double d ); void on_mGridStrokeWidthSpinBox_valueChanged( double d );