projection fix -related to grass bug

git-svn-id: http://svn.osgeo.org/qgis/trunk@4755 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 27, 2006 · 2e44dbc · 2e44dbc
1 parent 816004a
commit 2e44dbc
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp
@@ -61,11 +61,10 @@
 bool QgsGrassNewMapset::mRunning = false;
 
 QgsGrassNewMapset::QgsGrassNewMapset ( QgisApp *qgisApp, QgisIface *iface, 
-	QgsGrassPlugin *plugin,
-    QWidget * parent, const char * name, Qt::WFlags f )
-//:QgsGrassNewMapsetBase ( parent, name) //XXX removed Wflags f from this call to the base class constructor
-//Tim moved all parms during qt4 port - FIXME
-:QgsGrassNewMapsetBase ( ) //XXX removed Wflags f from this call to the base class constructor
+	QgsGrassPlugin *plugin, QWidget * parent, 
+        const char * name, Qt::WFlags f ):
+        Q3Wizard(parent, name, false, f),
+        QgsGrassNewMapsetBase ( ) 
 {
 #ifdef QGISDEBUG
   std::cerr << "QgsGrassNewMapset()" << std::endl;
@@ -471,9 +470,9 @@ void QgsGrassNewMapset::setGrassProjection()
 #endif
 	    // Note: GPJ_osr_to_grass() defaults in PROJECTION_XY if projection
 	    //       cannot be set
-	    // TODO: necessity of (void **)hSRS is maybe bug in GRASS library?
+
 	    int ret = GPJ_osr_to_grass ( &mCellHead, &mProjInfo, &mProjUnits, 
-				    (void **)hSRS, 0);
+				    &hSRS, 0);
 
 	    // Note: I seems that GPJ_osr_to_grass()returns always 1, 
 	    // 	 -> test if mProjInfo was set
@@ -1480,13 +1479,8 @@ void QgsGrassNewMapset::pageSelected( const QString & title )
 
 		mProjectionSelector->show();
 
-		// Warning: QgsProjectionSelector::sridSelected() is not implemented!
-		//          -> use lstCoordinateSystems directly
 		connect( mProjectionSelector, SIGNAL(sridSelected(QString)), 
 			 this, SLOT(sridSelected(QString)));
-		//connect( mProjectionSelector->lstCoordinateSystems, SIGNAL(selectionChanged ()), 
-		//	 this, SLOT(projectionSelected()));
-
 
 		// Se current QGIS projection
                 int srsid = QgsProject::instance()->readNumEntry(