Use the expat parser for the WFS provider because of smaller memory n…

…eeds and possibility to incrementally parse document git-svn-id: http://svn.osgeo.org/qgis/trunk@6434 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 15, 2007 · 1d5f897 · 1d5f897
1 parent 5731d6b
commit 1d5f897
Show file tree

Hide file tree

Showing 9 changed files with 860 additions and 9 deletions.
diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -394,7 +394,7 @@ QgsDataProvider* QgsProviderRegistry::getProvider( QString const & providerKey,
   }
   else
   {
-    QgsLogger::warning( "Failed to load ../providers/libproviders.so" );
+    QgsLogger::warning( "Failed to load " + lib );
     delete myLib;
     return 0;
   }

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -1,12 +1,12 @@
 
-SUBDIRS (copyright_label delimited_text grid_maker navigation north_arrow scale_bar wfs)
+SUBDIRS (copyright_label delimited_text grid_maker navigation north_arrow scale_bar)
 
 IF (POSTGRES_FOUND)
   SUBDIRS (geoprocessing spit)
 ENDIF (POSTGRES_FOUND)
 
 IF (EXPAT_FOUND)
-  SUBDIRS (gps_importer)
+  SUBDIRS (gps_importer wfs)
 ENDIF (EXPAT_FOUND)
 
 IF (GSL_FOUND)

diff --git a/src/plugins/wfs/CMakeLists.txt b/src/plugins/wfs/CMakeLists.txt
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
      ../../core ../../core/raster ../../core/renderer ../../core/symbology
      ../../gui
      ..
-     ../../providers/wfs
      ../../app # for QgsNewHttpConnection
      ${GEOS_INCLUDE_DIR}
      ${GEOS_INCLUDE_DIR}/geos

diff --git a/src/plugins/wfs/qgswfsplugin.cpp b/src/plugins/wfs/qgswfsplugin.cpp
@@ -21,7 +21,6 @@
 #include "qgssinglesymbolrenderer.h"
 #include "qgsvectorlayer.h"
 #include "qgswfsplugin.h"
-#include "qgswfsprovider.h"
 
 #include "mIconAddWfsLayer.xpm"
 

diff --git a/src/providers/CMakeLists.txt b/src/providers/CMakeLists.txt
@@ -1,12 +1,12 @@
 
-SUBDIRS (ogr wms delimitedtext wfs)
+SUBDIRS (ogr wms delimitedtext)
 
 IF (POSTGRES_FOUND)
   SUBDIRS (postgres)
 ENDIF (POSTGRES_FOUND)
 
 IF (EXPAT_FOUND)
-  SUBDIRS (gpx)
+  SUBDIRS (gpx wfs)
 ENDIF (EXPAT_FOUND)
 
 IF (GRASS_FOUND)

diff --git a/src/providers/wfs/CMakeLists.txt b/src/providers/wfs/CMakeLists.txt
@@ -2,8 +2,11 @@
 ########################################################
 # Files
 
-SET(WFS_SRCS qgswfsprovider.cpp)
+SET(WFS_SRCS qgswfsprovider.cpp qgswfsdata.cpp)
 
+SET (WFS_MOC_HDRS
+     qgswfsdata.h
+)
 
 ########################################################
 # Build
@@ -14,12 +17,15 @@ INCLUDE_DIRECTORIES (
   ../../core
   ${GEOS_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}/geos
+  ${EXPAT_INCLUDE_DIR}
 )
 
-ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS})
+ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS} ${WFS_MOC_SRCS})
 
 TARGET_LINK_LIBRARIES (wfsprovider
   ${QT_LIBRARIES}
+  ${GEOS_LIBRARY}
+  ${EXPAT_LIBRARY}
   qgis_core
 )