Fix warnings

qgis · Dec 29, 2013 · 6b4641d · 6b4641d
1 parent 7d712ac
commit 6b4641d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -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 )
   {

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -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 );

diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -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() ) );