fix warnings and icon size of GRASS toolbar

jef-n · jef-n · commit eae552ffa6f5 · 2012-01-29T20:54:02.000+01:00
diff --git a/src/app/qgsundowidget.cpp b/src/app/qgsundowidget.cpp
@@ -135,14 +135,12 @@ void QgsUndoWidget::setupUi( QDockWidget *UndoWidget )
   undoButton = new QPushButton( dockWidgetContents );
   undoButton->setObjectName( QString::fromUtf8( "undoButton" ) );
   undoButton->setIcon( QgisApp::instance()->getThemeIcon( "mActionUndo.png" ) );
-  undoButton->setIconSize( QSize( 24, 24 ) );
 
   gridLayout->addWidget( undoButton, 1, 0, 1, 1 );
 
   redoButton = new QPushButton( dockWidgetContents );
   redoButton->setObjectName( QString::fromUtf8( "redoButton" ) );
   redoButton->setIcon( QgisApp::instance()->getThemeIcon( "mActionRedo.png" ) );
-  redoButton->setIconSize( QSize( 24, 24 ) );
 
   gridLayout->addWidget( redoButton, 1, 1, 1, 1 );
 
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -181,7 +181,6 @@ void QgsGrassPlugin::initGui()
 
   // Add the toolbar to the main window
   toolBarPointer = qGisInterface->addToolBar( tr( "GRASS" ) );
-  toolBarPointer->setIconSize( QSize( 24, 24 ) );
   toolBarPointer->setObjectName( "GRASS" );
 
   // Add to the toolbar
diff --git a/src/plugins/grass/qgsgrassselect.cpp b/src/plugins/grass/qgsgrassselect.cpp
@@ -34,8 +34,8 @@ QgsGrassSelect::QgsGrassSelect( QWidget *parent, int type ): QDialog( parent ),
   QgsDebugMsg( QString( "QgsGrassSelect() type = %1" ).arg( type ) );
 
   setupUi( this );
-  connect( buttonBox, SIGNAL( accepted() ), SLOT( on_ok_clicked() ) );
-  connect( buttonBox, SIGNAL( rejected() ), this, SLOT( on_cancel_clicked() ) );
+  connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
+  connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
 
   if ( first )
   {
@@ -394,7 +394,7 @@ void QgsGrassSelect::on_GisdbaseBrowse_clicked()
   }
 }
 
-void QgsGrassSelect::on_ok_clicked()
+void QgsGrassSelect::accept()
 {
   gisdbase = egisdbase->text();
   lastGisdbase = QString( gisdbase );
@@ -456,8 +456,3 @@ void QgsGrassSelect::on_ok_clicked()
   }
   QDialog::accept();
 }
-
-void QgsGrassSelect::on_cancel_clicked()
-{
-  QDialog::reject();
-}
diff --git a/src/plugins/grass/qgsgrassselect.h b/src/plugins/grass/qgsgrassselect.h
@@ -49,11 +49,7 @@ class QgsGrassSelect: public QDialog, private Ui::QgsGrassSelectBase
     int      selectedType;  // RASTER or GROUP
 
   public slots:
-    //! OK
-    void on_ok_clicked();
-
-    //! Cancel
-    void on_cancel_clicked();
+    void accept();
 
     //! Open dialog for Gisdbase
     void on_GisdbaseBrowse_clicked();
@@ -74,7 +70,6 @@ class QgsGrassSelect: public QDialog, private Ui::QgsGrassSelectBase
     void on_emap_activated() { setLayers(); }
     void setLayers();
 
-
   private:
     int type; // map type (mapset element)
     static bool first; // called first time

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ QgsGrassSelect::QgsGrassSelect( QWidget *parent, int type ): QDialog( parent ),`
`34`	`34`	`QgsDebugMsg( QString( "QgsGrassSelect() type = %1" ).arg( type ) );`
`35`	`35`
`36`	`36`	`setupUi( this );`
`37`		`- connect( buttonBox, SIGNAL( accepted() ), SLOT( on_ok_clicked() ) );`
`38`		`- connect( buttonBox, SIGNAL( rejected() ), this, SLOT( on_cancel_clicked() ) );`
	`37`	`+ connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );`
	`38`	`+ connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );`
`39`	`39`
`40`	`40`	`if ( first )`
`41`	`41`	`{`
`@@ -394,7 +394,7 @@ void QgsGrassSelect::on_GisdbaseBrowse_clicked()`
`394`	`394`	`}`
`395`	`395`	`}`
`396`	`396`
`397`		`-void QgsGrassSelect::on_ok_clicked()`
	`397`	`+void QgsGrassSelect::accept()`
`398`	`398`	`{`
`399`	`399`	`gisdbase = egisdbase->text();`
`400`	`400`	`lastGisdbase = QString( gisdbase );`
`@@ -456,8 +456,3 @@ void QgsGrassSelect::on_ok_clicked()`
`456`	`456`	`}`
`457`	`457`	`QDialog::accept();`
`458`	`458`	`}`
`459`		`-`
`460`		`-void QgsGrassSelect::on_cancel_clicked()`
`461`		`-{`
`462`		`- QDialog::reject();`
`463`		`-}`