[API] removed QgsSearchString - QgsExpression should be used instead

qgis · Jul 15, 2012 · e35b11588103f4ce4c3580923123abbaa1ff501b · e35b115
1 parent a0a0e04
commit e35b11588103f4ce4c3580923123abbaa1ff501b
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 2,193 deletions.
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -73,8 +73,6 @@
 %Include qgsrenderer.sip
 %Include qgsrunprocess.sip
 %Include qgsscalecalculator.sip
-%Include qgssearchstring.sip
-%Include qgssearchtreenode.sip
 %Include qgssinglesymbolrenderer.sip
 %Include qgssnapper.sip
 %Include qgsspatialindex.sip

diff --git a/python/core/qgssearchstring.sip b/python/core/qgssearchstring.sip
diff --git a/python/core/qgssearchtreenode.sip b/python/core/qgssearchtreenode.sip
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -98,8 +98,6 @@ SET(QGIS_CORE_SRCS
   qgsrectangle.cpp
   qgsrunprocess.cpp
   qgsscalecalculator.cpp
-  qgssearchstring.cpp
-  qgssearchtreenode.cpp
   qgssnapper.cpp
   qgscoordinatereferencesystem.cpp
   qgstolerance.cpp
@@ -244,9 +242,9 @@ IF (WITH_INTERNAL_SPATIALITE)
   INCLUDE_DIRECTORIES(BEFORE spatialite/headers/spatialite)
 ENDIF (WITH_INTERNAL_SPATIALITE)
 
-ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll qgsexpressionlexer.ll)
+ADD_FLEX_FILES(QGIS_CORE_SRCS qgsexpressionlexer.ll)
 
-ADD_BISON_FILES(QGIS_CORE_SRCS qgssearchstringparser.yy qgsexpressionparser.yy)
+ADD_BISON_FILES(QGIS_CORE_SRCS qgsexpressionparser.yy)
 
 SET(QGIS_CORE_MOC_HDRS
   qgsapplication.h
@@ -362,8 +360,6 @@ SET(QGIS_CORE_HDRS
   qgsrendercontext.h
   qgsrunprocess.h
   qgsscalecalculator.h
-  qgssearchstring.h
-  qgssearchtreenode.h
   qgssnapper.h
   qgscoordinatereferencesystem.h
   qgsvectordataprovider.h