spatial query: cosmetic changes and set svn keywords

jef · jef · commit d69d9faffcf8 · 2010-04-25T01:07:36.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13377 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp b/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 #include "qgsgeometrycoordinatetransform.h"
 
diff --git a/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h b/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 #ifndef GEOMETRYCOORDINATETRANSFORM_H
 #define GEOMETRYCOORDINATETRANSFORM_H
 
diff --git a/src/plugins/spatialquery/qgsmngprogressbar.cpp b/src/plugins/spatialquery/qgsmngprogressbar.cpp
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 #include "qgsmngprogressbar.h"
 
diff --git a/src/plugins/spatialquery/qgsmngprogressbar.h b/src/plugins/spatialquery/qgsmngprogressbar.h
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 #ifndef QGSMNGPROGRESSBAR_H
 #define QGSMNGPROGRESSBAR_H
 
diff --git a/src/plugins/spatialquery/qgsreaderfeatures.cpp b/src/plugins/spatialquery/qgsreaderfeatures.cpp
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 #include <qgsvectordataprovider.h>
 
@@ -54,19 +54,15 @@ void QgsReaderFeatures::initReader( bool useSelection )
   }
   else
   {
-    QgsAttributeList attListGeom;
-    int idGeom = 0;
-    attListGeom.append( idGeom );
-    mLayer->select( attListGeom, mLayer->extent(), true, false );
+    mLayer->select( QgsAttributeList() );
     mFuncNextFeature = &QgsReaderFeatures::nextFeatureTotal;
   }
 
 } // void QgsReaderFeatures::initReader()
 
 bool QgsReaderFeatures::nextFeatureTotal( QgsFeature & feature )
 {
-  return mLayer->dataProvider()->nextFeature( feature );
-
+  return mLayer->nextFeature( feature );
 } // bool QgsReaderFeatures::nextFeatureTotal ( QgsFeature & feature )
 
 bool QgsReaderFeatures::nextFeatureSelected( QgsFeature & feature )
@@ -82,7 +78,4 @@ bool QgsReaderFeatures::nextFeatureSelected( QgsFeature & feature )
     mIterSelectedFeature++;
   }
   return bReturn;
-
 } // bool QgsReaderFeatures::nextFeatureSelected( QgsFeature &feature )
-
-
diff --git a/src/plugins/spatialquery/qgsreaderfeatures.h b/src/plugins/spatialquery/qgsreaderfeatures.h
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 #ifndef READERFEATURES_H
 #define READERFEATURES_H
 
diff --git a/src/plugins/spatialquery/qgsrubberselectid.cpp b/src/plugins/spatialquery/qgsrubberselectid.cpp
@@ -16,7 +16,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 #include "qgsrubberselectid.h"
 
diff --git a/src/plugins/spatialquery/qgsrubberselectid.h b/src/plugins/spatialquery/qgsrubberselectid.h
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 #ifndef QGSRUBBERSELECTID_H
 #define QGSRUBBERSELECTID_H
diff --git a/src/plugins/spatialquery/qgsspatialquery.cpp b/src/plugins/spatialquery/qgsspatialquery.cpp
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 #include <QMessageBox>
 
@@ -195,12 +195,8 @@ void QgsSpatialQuery::setSpatialIndexReference()
   QgsReaderFeatures * readerFeaturesReference = new QgsReaderFeatures( mLayerReference, mUseReferenceSelection );
   QgsFeature feature;
   int step = 1;
-  while ( true )
+  while ( readerFeaturesReference->nextFeature( feature ) )
   {
-    if ( ! readerFeaturesReference->nextFeature( feature ) )
-    {
-      break;
-    }
     mPb->step( step++ );
 
     if ( ! hasValidGeometry( feature ) )
@@ -293,7 +289,7 @@ void QgsSpatialQuery::populateIndexResult(
   {
     mLayerReference->featureAtId( *iterIdReference, featureReference );
     geomReference = featureReference.geometry();
-    if (( geomTarget->*op )( geomReference ) == 1 )
+    if (( geomTarget->*op )( geomReference ) )
     {
       qsetIndexResult.insert( idTarget );
       break;
@@ -321,7 +317,8 @@ void QgsSpatialQuery::populateIndexResultDisjoint(
   {
     mLayerReference->featureAtId( *iterIdReference, featureReference );
     geomReference = featureReference.geometry();
-    if (( geomTarget->*op )( geomTarget ) == 0 )
+
+    if ( !( geomTarget->*op )( geomTarget ) )
     {
       addIndex = false;
       break;
diff --git a/src/plugins/spatialquery/qgsspatialquery.h b/src/plugins/spatialquery/qgsspatialquery.h
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 #ifndef SPATIALQUERY_H
 #define SPATIALQUERY_H
 
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 #include <QMessageBox>
 #include <QDateTime>
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.h b/src/plugins/spatialquery/qgsspatialquerydialog.h
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 #ifndef SPATIALQUERYDIALOG_H
 #define SPATIALQUERYDIALOG_H
diff --git a/src/plugins/spatialquery/qgsspatialqueryplugin.cpp b/src/plugins/spatialquery/qgsspatialqueryplugin.cpp
@@ -16,7 +16,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 
 //
diff --git a/src/plugins/spatialquery/qgsspatialqueryplugin.h b/src/plugins/spatialquery/qgsspatialqueryplugin.h
@@ -16,7 +16,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*  $Id: $ */
+/*  $Id$ */
 
 #ifndef SPATIALQUERYPLUGIN_H
 #define SPATIALQUERYPLUGIN_H
