Fix compiler warnings in providers

g_j_m · g_j_m · commit 6ae76d1a986b · 2007-02-03T02:26:02.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6498 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/gpx/gpsdata.h b/src/providers/gpx/gpsdata.h
@@ -47,6 +47,7 @@ typedef QSet<int> QgsFeatureIds;
 */
 class GPSObject {
  public:
+  virtual ~GPSObject() {};
   QString xmlify(const QString& str);
   virtual void writeXML(QTextStream& stream);
   QString name, cmt, desc, src, url, urlname;
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -213,7 +213,7 @@ void QgsOgrProvider::loadFields()
       for(int i=0;i<fdef->GetFieldCount();++i)
       {
         OGRFieldDefn *fldDef = fdef->GetFieldDefn(i);
-        OGRFieldType type = type = fldDef->GetType();
+        OGRFieldType type = fldDef->GetType();
         bool numeric = (type == OFTInteger || type == OFTReal);
         mAttributeFields.insert(i, QgsField(
               mEncoding->toUnicode(fldDef->GetNameRef()), 
@@ -495,7 +495,7 @@ void QgsOgrProvider::getFeatureGeometry(int key, QgsFeature *f)
 
   if ((fet = ogrLayer->GetFeature(key)) != NULL)
   {
-    if (geom = fet->GetGeometryRef())
+      if ((geom = fet->GetGeometryRef()))
     {
       geom = fet->GetGeometryRef();
       // get the wkb representation
@@ -741,6 +741,13 @@ bool QgsOgrProvider::addFeature(QgsFeature& f)
 	  }
         break;
       }
+    default:
+      {
+        QgsLogger::debug("Unknown feature type of: ", (int)(ftype), 1, 
+                         __FILE__, __FUNCTION__, __LINE__);
+	return false;
+	break;
+      }
   }
   
   QgsAttributeMap attrs = f.attributeMap();
@@ -1411,6 +1418,13 @@ QGISEXTERN bool createEmptyDataSource(const QString& uri,
     case QGis::WKBPolygon:
       OGRvectortype = wkbPolygon;
       break;
+    default:
+      {
+        QgsLogger::debug("Unknown vector type of: ", (int)(vectortype), 1, 
+                         __FILE__, __FUNCTION__, __LINE__);
+	return false;
+	break;
+      }
     }
 
     OGRLayer* layer;	
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -301,6 +301,8 @@ int QgsWFSProvider::describeFeatureType(const QString& uri, QString& geometryAtt
       return describeFeatureTypePOST(uri, geometryAttribute, fields);
     case QgsWFSProvider::SOAP:
       return describeFeatureTypeSOAP(uri, geometryAttribute, fields);
+    case QgsWFSProvider::FILE:
+      return describeFeatureTypeFile(uri, geometryAttribute, fields);
     }
   return 1;
 }
@@ -534,7 +536,7 @@ int QgsWFSProvider::readAttributesFromSchema(QDomDocument& schemaDoc, QString& g
       
       //find <complexType name=complexTypeType
       QDomNodeList complexTypeNodeList = schemaElement.elementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "complexType");
-      for(int i = 0; i < complexTypeNodeList.length(); ++i)
+      for(uint i = 0; i < complexTypeNodeList.length(); ++i)
 	{
 	  if(complexTypeNodeList.at(i).toElement().attribute("name") == complexTypeType)
 	    {
@@ -556,7 +558,7 @@ int QgsWFSProvider::readAttributesFromSchema(QDomDocument& schemaDoc, QString& g
       return 5;
     }
 
-  for(int i = 0; i < attributeNodeList.length(); ++i)
+  for(uint i = 0; i < attributeNodeList.length(); ++i)
     {
       QDomElement attributeElement = attributeNodeList.at(i).toElement();
       //attribute name

Original file line number	Diff line number	Diff line change
`@@ -301,6 +301,8 @@ int QgsWFSProvider::describeFeatureType(const QString& uri, QString& geometryAtt`
`301`	`301`	`return describeFeatureTypePOST(uri, geometryAttribute, fields);`
`302`	`302`	`case QgsWFSProvider::SOAP:`
`303`	`303`	`return describeFeatureTypeSOAP(uri, geometryAttribute, fields);`
	`304`	`+ case QgsWFSProvider::FILE:`
	`305`	`+ return describeFeatureTypeFile(uri, geometryAttribute, fields);`
`304`	`306`	`}`
`305`	`307`	`return 1;`
`306`	`308`	`}`
`@@ -534,7 +536,7 @@ int QgsWFSProvider::readAttributesFromSchema(QDomDocument& schemaDoc, QString& g`
`534`	`536`
`535`	`537`	`//find <complexType name=complexTypeType`
`536`	`538`	`QDomNodeList complexTypeNodeList = schemaElement.elementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "complexType");`
`537`		`- for(int i = 0; i < complexTypeNodeList.length(); ++i)`
	`539`	`+ for(uint i = 0; i < complexTypeNodeList.length(); ++i)`
`538`	`540`	`{`
`539`	`541`	`if(complexTypeNodeList.at(i).toElement().attribute("name") == complexTypeType)`
`540`	`542`	`{`
`@@ -556,7 +558,7 @@ int QgsWFSProvider::readAttributesFromSchema(QDomDocument& schemaDoc, QString& g`
`556`	`558`	`return 5;`
`557`	`559`	`}`
`558`	`560`
`559`		`- for(int i = 0; i < attributeNodeList.length(); ++i)`
	`561`	`+ for(uint i = 0; i < attributeNodeList.length(); ++i)`
`560`	`562`	`{`
`561`	`563`	`QDomElement attributeElement = attributeNodeList.at(i).toElement();`
`562`	`564`	`//attribute name`