fix warning

jef · jef · commit 815b4c7095f0 · 2010-10-05T09:21:43.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14336 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/mapserver/qgsfilter.cpp b/src/mapserver/qgsfilter.cpp
@@ -117,14 +117,15 @@ QgsFilter* QgsFilter::createFilterFromXml( const QDomElement& filterElem, QgsVec
   }
 
   //get property index
-  int attributeIndex;
+  int attributeIndex = -1;
   if ( vl->dataProvider() )
   {
     attributeIndex = vl->dataProvider()->fieldNameIndex( attributeName );
-    if ( attributeIndex == -1 )
-    {
-      return 0;
-    }
+  }
+
+  if ( attributeIndex == -1 )
+  {
+    return 0;
   }
 
   //get literal value(s)

Original file line number	Diff line number	Diff line change
`@@ -117,14 +117,15 @@ QgsFilter* QgsFilter::createFilterFromXml( const QDomElement& filterElem, QgsVec`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`//get property index`
`120`		`- int attributeIndex;`
	`120`	`+ int attributeIndex = -1;`
`121`	`121`	`if ( vl->dataProvider() )`
`122`	`122`	`{`
`123`	`123`	`attributeIndex = vl->dataProvider()->fieldNameIndex( attributeName );`
`124`		`- if ( attributeIndex == -1 )`
`125`		`- {`
`126`		`- return 0;`
`127`		`- }`
	`124`	`+ }`
	`125`	`+`
	`126`	`+ if ( attributeIndex == -1 )`
	`127`	`+ {`
	`128`	`+ return 0;`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`//get literal value(s)`