fix some warnings

jef · jef · commit 78fc652bc26d · 2009-01-31T16:46:43.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@10069 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2269,7 +2269,7 @@ void QgisApp::loadOGRSublayers( QString uri, QStringList list )
   for ( int i = 0; i < list.size(); i++ )
   {
     QString composedURI = uri + "&layername=" + list.at( i );
-    QgsVectorLayer *layer = addVectorLayer( composedURI, fileName + ":" + list.at( i ), "ogr" );
+    addVectorLayer( composedURI, fileName + ":" + list.at( i ), "ogr" );
   }
 }
 
@@ -5017,7 +5017,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
         if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries )
         {
           //don't enable vertex move for single point
-          if ( vlayer->wkbType() != QGis::WKBPoint && vlayer->wkbType() != QGis::WKBPoint25D )
+          if ( QGis::wkbType2d( vlayer->wkbType() ) != QGis::WKBPoint )
           {
             mActionMoveVertex->setEnabled( true );
           }
diff --git a/src/core/qgsclipper.cpp b/src/core/qgsclipper.cpp
@@ -31,9 +31,3 @@ const double QgsClipper::MAX_Y =  30000;
 const double QgsClipper::MIN_Y = -30000;
 
 const double QgsClipper::SMALL_NUM = 1e-12;
-
-
-
-
-
-
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -208,7 +208,7 @@ QStringList QgsOgrProvider::subLayers() const
   {
     return theList;
   }
-  for ( int i = 0; i < layerCount() ; i++ )
+  for ( unsigned int i = 0; i < layerCount() ; i++ )
   {
     QString theLayerName = QString( OGR_FD_GetName( OGR_L_GetLayerDefn( OGR_DS_GetLayer( ogrDataSource, i ) ) ) );
     OGRwkbGeometryType layerGeomType = OGR_FD_GetGeomType( OGR_L_GetLayerDefn( OGR_DS_GetLayer( ogrDataSource, i ) ) );
@@ -219,19 +219,19 @@ QStringList QgsOgrProvider::subLayers() const
     switch ( layerGeomType )
     {
       case wkbUnknown:            geom = "Unknown"; break;
-      case wkbPoint:              geom="Point"; break;
-      case wkbLineString:         geom="LineString"; break;
-      case wkbPolygon:            geom="Polygon"; break;
-      case wkbMultiPoint:         geom="MultiPoint"; break;
-      case wkbMultiLineString:    geom="MultiLineString"; break;
+      case wkbPoint:              geom = "Point"; break;
+      case wkbLineString:         geom = "LineString"; break;
+      case wkbPolygon:            geom = "Polygon"; break;
+      case wkbMultiPoint:         geom = "MultiPoint"; break;
+      case wkbMultiLineString:    geom = "MultiLineString"; break;
       case wkbGeometryCollection: geom = "GeometryCollection"; break;
       case wkbNone:               geom = "None"; break;
-      case wkbPoint25D:           geom="Point25D"; break;
-      case wkbLineString25D:      geom="LineString25D"; break;
-      case wkbPolygon25D:         geom="Polygon25D"; break;
-      case wkbMultiPoint25D:      geom="MultiPoint25D"; break;
-      case wkbMultiLineString25D: geom="MultiLineString25D"; break;
-      case wkbMultiPolygon25D:    geom="MultiPolygon25D"; break;
+      case wkbPoint25D:           geom = "Point25D"; break;
+      case wkbLineString25D:      geom = "LineString25D"; break;
+      case wkbPolygon25D:         geom = "Polygon25D"; break;
+      case wkbMultiPoint25D:      geom = "MultiPoint25D"; break;
+      case wkbMultiLineString25D: geom = "MultiLineString25D"; break;
+      case wkbMultiPolygon25D:    geom = "MultiPolygon25D"; break;
       default: geom="Unknown WKB: " + QString::number( layerGeomType );
     }
     theList.append( QString::number( i ) + ":" + theLayerName + ":" + QString::number( theLayerFeatureCount ) + ":" + geom );
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -306,7 +306,6 @@ bool QgsPythonUtilsImpl::getError( QString& errorClassName, QString& errorText )
   if ( !PyErr_Occurred() )
     return false;
 
-  PyObject* obj_str;
   PyObject* err_type;
   PyObject* err_value;
   PyObject* err_tb;

Original file line number	Diff line number	Diff line change
`@@ -2269,7 +2269,7 @@ void QgisApp::loadOGRSublayers( QString uri, QStringList list )`
`2269`	`2269`	`for ( int i = 0; i < list.size(); i++ )`
`2270`	`2270`	`{`
`2271`	`2271`	`QString composedURI = uri + "&layername=" + list.at( i );`
`2272`		`- QgsVectorLayer *layer = addVectorLayer( composedURI, fileName + ":" + list.at( i ), "ogr" );`
	`2272`	`+ addVectorLayer( composedURI, fileName + ":" + list.at( i ), "ogr" );`
`2273`	`2273`	`}`
`2274`	`2274`	`}`
`2275`	`2275`
`@@ -5017,7 +5017,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )`
`5017`	`5017`	`if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries )`
`5018`	`5018`	`{`
`5019`	`5019`	`//don't enable vertex move for single point`
`5020`		`- if ( vlayer->wkbType() != QGis::WKBPoint && vlayer->wkbType() != QGis::WKBPoint25D )`
	`5020`	`+ if ( QGis::wkbType2d( vlayer->wkbType() ) != QGis::WKBPoint )`
`5021`	`5021`	`{`
`5022`	`5022`	`mActionMoveVertex->setEnabled( true );`
`5023`	`5023`	`}`