remove spatialindex include

qgis · Nov 6, 2011 · 09f98fc · 09f98fc
1 parent dfdd2bc
commit 09f98fc
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 12 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -71,7 +71,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR} 
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/renderer
-  ${CMAKE_CURRENT_SOURCE_DIR}/../core/spatialindex
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/raster
   interpolation
   ${PROJ_INCLUDE_DIR}

diff --git a/src/analysis/network/CMakeLists.txt b/src/analysis/network/CMakeLists.txt
@@ -34,13 +34,11 @@ SET(QGIS_NETWORK_ANALYSIS_HDRS
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR} 
   ${CMAKE_CURRENT_SOURCE_DIR}../../core/
-  ${CMAKE_CURRENT_SOURCE_DIR}../../core/spatialindex 
   ${PROJ_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
 )
 
-
 #############################################################
 # qgis_analysis library
 

diff --git a/src/app/composer/qgscomposertablewidget.cpp b/src/app/composer/qgscomposertablewidget.cpp
@@ -64,7 +64,7 @@ QgsComposerTableWidget::~QgsComposerTableWidget()
 
 }
 
-void QgsComposerTableWidget::showEvent( QShowEvent* event )
+void QgsComposerTableWidget::showEvent( QShowEvent* /* event */ )
 {
   refreshMapComboBox();
 }

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -173,8 +173,7 @@ SET(QGIS_CORE_SRCS
   symbology/qgssymbologyutils.cpp
 
   qgsspatialindex.cpp
-
-  )
+)
 
 IF(WIN32)
     SET(QGIS_CORE_SRCS
@@ -400,7 +399,6 @@ INCLUDE_DIRECTORIES(
   symbology
   symbology-ng
   gps/qextserialport
-  spatialindex/include
   ${PROJ_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}

diff --git a/src/plugins/roadgraph/CMakeLists.txt b/src/plugins/roadgraph/CMakeLists.txt
@@ -28,11 +28,11 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${GEOS_INCLUDE_DIR}
   ../../core
-  ../../core/spatialindex
   ../../gui
   ../../analysis/network
   ..
   )
+
 ########################################################
 # Build
 

diff --git a/src/plugins/spatialquery/CMakeLists.txt b/src/plugins/spatialquery/CMakeLists.txt
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}/../../ui/
      ../../core
-     ../../core/spatialindex
      ../../core/raster
      ../../core/renderer
      ../../core/symbology

diff --git a/src/providers/memory/CMakeLists.txt b/src/providers/memory/CMakeLists.txt
@@ -3,7 +3,7 @@ SET (MEMORY_SRCS qgsmemoryprovider.cpp)
 
 INCLUDE_DIRECTORIES(
   .
-  ../../core ../../core/spatialindex
+  ../../core
   ${GEOS_INCLUDE_DIR}
 )
 

diff --git a/src/providers/spatialite/qgsspatialiteconnection.cpp b/src/providers/spatialite/qgsspatialiteconnection.cpp
@@ -57,7 +57,7 @@ QgsSpatiaLiteConnection::Error QgsSpatiaLiteConnection::fetchTables( bool loadGe
     return FailedToOpen;
   }
 
-  bool isSpatiaLite = checkHasMetadataTables( handle );
+  checkHasMetadataTables( handle );
   if ( !mErrorMsg.isNull() )
   {
     // unexpected error; invalid SpatiaLite DB

diff --git a/src/providers/wfs/CMakeLists.txt b/src/providers/wfs/CMakeLists.txt
@@ -31,7 +31,6 @@ QT4_WRAP_CPP(WFS_MOC_SRCS ${WFS_MOC_HDRS})
 
 INCLUDE_DIRECTORIES (
   ../../core
-  ../../core/spatialindex
   ../../gui
   ${CMAKE_CURRENT_BINARY_DIR}/../../ui
   ${GEOS_INCLUDE_DIR}