Update SQLAnywhere data provider to the new API.

qgis · Jan 30, 2013 · 8579809 · 8579809
1 parent b4a6a83
commit 8579809
Show file tree

Hide file tree

Showing 7 changed files with 452 additions and 397 deletions.
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -11,7 +11,7 @@ ADD_SUBDIRECTORY(coordinate_capture)
 ADD_SUBDIRECTORY(dxf2shp_converter)
 ADD_SUBDIRECTORY(evis)
 ADD_SUBDIRECTORY(spatialquery)
-#ADD_SUBDIRECTORY(sqlanywhere) # TODO: enable when migrated to new api
+ADD_SUBDIRECTORY(sqlanywhere)
 ADD_SUBDIRECTORY(roadgraph)
 ADD_SUBDIRECTORY(zonal_statistics)
 ADD_SUBDIRECTORY(georeferencer)

diff --git a/src/providers/CMakeLists.txt b/src/providers/CMakeLists.txt
@@ -7,7 +7,7 @@ ADD_SUBDIRECTORY(ogr)
 ADD_SUBDIRECTORY(wms)
 ADD_SUBDIRECTORY(delimitedtext)
 ADD_SUBDIRECTORY(osm)
-#ADD_SUBDIRECTORY(sqlanywhere)   # TODO: enable when migrated to new api
+ADD_SUBDIRECTORY(sqlanywhere)
 ADD_SUBDIRECTORY(gdal)
 #ADD_SUBDIRECTORY(mssql)         # TODO: enable when migrated to new api
 ADD_SUBDIRECTORY(ows)

diff --git a/src/providers/sqlanywhere/CMakeLists.txt b/src/providers/sqlanywhere/CMakeLists.txt
@@ -3,8 +3,14 @@
 
 ADD_SUBDIRECTORY(sqlanyconnection)
 
-SET (SA_SRCS qgssqlanywhereprovider.cpp)
-SET (SA_MOC_HDRS qgssqlanywhereprovider.h)
+SET (SA_SRCS
+  qgssqlanywhereprovider.cpp
+  qgssqlanywherefeatureiterator.cpp
+)
+SET (SA_MOC_HDRS
+  qgssqlanywhereprovider.h
+  qgssqlanywherefeatureiterator.h
+)
 
 ADD_DEFINITIONS("-DSACONN_EXPORT=${DLLEXPORT}")
 
@@ -15,7 +21,7 @@ QT4_WRAP_CPP (SA_MOC_SRCS  ${SA_MOC_HDRS})
 
 INCLUDE_DIRECTORIES(
      ${GEOS_INCLUDE_DIR}
-     ../../core 
+     ../../core
      sqlanyconnection
 )