Skip to content
Permalink
Browse files

Fix warnings

  • Loading branch information
nyalldawson committed Dec 29, 2013
1 parent 7d712ac commit 6b4641d1480e0614f0d64f42e7d68cce1667f9ce
@@ -352,8 +352,8 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
{
mStatusZoomCombo->insertItem( 0, QString( tr( "%1\%" ) ).arg(( *zoom_it ) * 100 ) );
}
connect( mStatusZoomCombo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( on_mStatusZoomCombo_currentIndexChanged( int ) ) );
connect( mStatusZoomCombo->lineEdit(), SIGNAL( returnPressed() ), this, SLOT( on_mStatusZoomCombo_zoomEntered() ) );
connect( mStatusZoomCombo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( statusZoomCombo_currentIndexChanged( int ) ) );
connect( mStatusZoomCombo->lineEdit(), SIGNAL( returnPressed() ), this, SLOT( statusZoomCombo_zoomEntered() ) );

//create status bar labels
mStatusCursorXLabel = new QLabel( mStatusBar );
@@ -693,7 +693,7 @@ void QgsComposer::updateStatusZoom()
mStatusZoomCombo->blockSignals( false );
}

void QgsComposer::on_mStatusZoomCombo_currentIndexChanged( int index )
void QgsComposer::statusZoomCombo_currentIndexChanged( int index )
{
double selectedZoom = mStatusZoomLevelsList[ mStatusZoomLevelsList.count() - index - 1 ];
if ( mView )
@@ -706,7 +706,7 @@ void QgsComposer::on_mStatusZoomCombo_currentIndexChanged( int index )
}
}

void QgsComposer::on_mStatusZoomCombo_zoomEntered()
void QgsComposer::statusZoomCombo_zoomEntered()
{
if ( !mView )
{
@@ -374,9 +374,9 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
//! Updates zoom level in status bar
void updateStatusZoom();

void on_mStatusZoomCombo_currentIndexChanged( int index );
void statusZoomCombo_currentIndexChanged( int index );

void on_mStatusZoomCombo_zoomEntered();
void statusZoomCombo_zoomEntered();

//! Updates status bar composition message
void updateStatusCompositionMsg( QString message );
@@ -90,9 +90,6 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg
connect( mGridCheckBox, SIGNAL( toggled( bool ) ),
mDrawAnnotationCheckableGroupBox, SLOT( setEnabled( bool ) ) );

connect( mFrameStyleComboBox, SIGNAL( currentIndexChanged( QString ) ),
this, SLOT( frameStyleChanged( QString ) ) );

if ( composerMap )
{
connect( composerMap, SIGNAL( itemChanged() ), this, SLOT( setGuiElementValues() ) );

0 comments on commit 6b4641d

Please sign in to comment.
You can’t perform that action at this time.