[QGIS Commit] r10069 - in trunk/qgis/src: app core providers/ogr
python
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Jan 31 11:46:43 EST 2009
Author: jef
Date: 2009-01-31 11:46:43 -0500 (Sat, 31 Jan 2009)
New Revision: 10069
Modified:
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/core/qgsclipper.cpp
trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
trunk/qgis/src/python/qgspythonutilsimpl.cpp
Log:
fix some warnings
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2009-01-31 16:45:58 UTC (rev 10068)
+++ trunk/qgis/src/app/qgisapp.cpp 2009-01-31 16:46:43 UTC (rev 10069)
@@ -2269,7 +2269,7 @@
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 @@
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 );
}
Modified: trunk/qgis/src/core/qgsclipper.cpp
===================================================================
--- trunk/qgis/src/core/qgsclipper.cpp 2009-01-31 16:45:58 UTC (rev 10068)
+++ trunk/qgis/src/core/qgsclipper.cpp 2009-01-31 16:46:43 UTC (rev 10069)
@@ -31,9 +31,3 @@
const double QgsClipper::MIN_Y = -30000;
const double QgsClipper::SMALL_NUM = 1e-12;
-
-
-
-
-
-
Modified: trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
===================================================================
--- trunk/qgis/src/providers/ogr/qgsogrprovider.cpp 2009-01-31 16:45:58 UTC (rev 10068)
+++ trunk/qgis/src/providers/ogr/qgsogrprovider.cpp 2009-01-31 16:46:43 UTC (rev 10069)
@@ -208,7 +208,7 @@
{
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 @@
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 );
Modified: trunk/qgis/src/python/qgspythonutilsimpl.cpp
===================================================================
--- trunk/qgis/src/python/qgspythonutilsimpl.cpp 2009-01-31 16:45:58 UTC (rev 10068)
+++ trunk/qgis/src/python/qgspythonutilsimpl.cpp 2009-01-31 16:46:43 UTC (rev 10069)
@@ -306,7 +306,6 @@
if ( !PyErr_Occurred() )
return false;
- PyObject* obj_str;
PyObject* err_type;
PyObject* err_value;
PyObject* err_tb;
More information about the QGIS-commit
mailing list