merge r10128 in version 1.0

git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@10129 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

src/core/spatialindex/include/Tools.h

@@ -25,8 +25,10 @@
 #ifdef _MSC_VER
 #include <locale>
 #include <limits>
-#endif//_MSC_VER
+typedef unsigned __int8 uint8_t;
+#else
 #include <stdint.h>
+#endif//_MSC_VER
 #include <assert.h>
 #include <iostream>
 #include <iomanip>

src/core/spatialindex/qgsspatialindex.cpp

@@ -113,10 +113,12 @@ bool QgsSpatialIndex::insertFeature( QgsFeature& f )
   }
   catch ( Tools::Exception &e )
   {
+    Q_UNUSED(e);
     QgsDebugMsg( QString( "Tools::Exception caught: " ).arg( e.what().c_str() ) );
   }
   catch ( const std::exception &e )
   {
+    Q_UNUSED(e);
     QgsDebugMsg( QString( "std::exception caught: " ).arg( e.what() ) );
   }
   catch ( ... )

src/core/spatialindex/rtree/RTree.cc

@@ -1177,6 +1177,7 @@ long SpatialIndex::RTree::RTree::writeNode( Node* n )
   }
   catch ( Tools::InvalidPageException& e )
   {
+    Q_UNUSED(e);
     delete[] buffer;
     QgsDebugMsg( e.what().c_str() );
     throw Tools::IllegalStateException( "writeNode: failed with Tools::InvalidPageException" );
@@ -1222,6 +1223,7 @@ SpatialIndex::RTree::NodePtr SpatialIndex::RTree::RTree::readNode( unsigned long
   }
   catch ( Tools::InvalidPageException& e )
   {
+    Q_UNUSED(e);
     QgsDebugMsg( e.what().c_str() );
     throw Tools::IllegalStateException( "readNode: failed with Tools::InvalidPageException" );
   }
@@ -1272,6 +1274,7 @@ void SpatialIndex::RTree::RTree::deleteNode( Node* n )
   }
   catch ( Tools::InvalidPageException& e )
   {
+    Q_UNUSED(e);
     QgsDebugMsg( e.what().c_str() );
     throw Tools::IllegalStateException( "deleteNode: failed with Tools::InvalidPageException" );
   }