Add a convenience constructor from QString to QgsSearchString

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13944 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 20, 2010 · fef94ad · fef94ad
1 parent ac8383e
commit fef94ad
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/python/core/qgssearchstring.sip b/python/core/qgssearchstring.sip
@@ -9,6 +9,10 @@ class QgsSearchString
     //! constructor
     QgsSearchString();
 
+    //! construct and parse a string
+    //! @note added in v1.6
+    QgsSearchString( const QString & str );
+
     //! copy constructor - makes also copy of search tree
     QgsSearchString( const QgsSearchString& str );
 

diff --git a/src/core/qgssearchstring.cpp b/src/core/qgssearchstring.cpp
@@ -30,6 +30,11 @@ QgsSearchString::QgsSearchString()
   mTree = NULL;
 }
 
+QgsSearchString::QgsSearchString( const QString & str )
+{
+  mTree = NULL;
+  setString( str );
+}
 
 QgsSearchString::QgsSearchString( const QgsSearchString& str )
 {
@@ -62,8 +67,10 @@ QgsSearchString::~QgsSearchString()
 
 bool QgsSearchString::setString( QString str )
 {
+  mParserErrorMsg.clear();
+
   // empty string
-  if ( str == "" )
+  if ( str.isEmpty() )
   {
     clear();
     return true;
@@ -107,5 +114,5 @@ void QgsSearchString::clear()
 {
   delete mTree;
   mTree = NULL;
-  mString = "";
+  mString.clear();
 }
diff --git a/src/core/qgssearchstring.h b/src/core/qgssearchstring.h
@@ -35,9 +35,13 @@ class QgsSearchTreeNode;
 class CORE_EXPORT QgsSearchString
 {
   public:
-    //! constructor
+    //! construct an empty string
     QgsSearchString();
 
+    //! construct and parse a string
+    //! @note added in v1.6
+    QgsSearchString( const QString & str );
+
     //! copy constructor - makes also copy of search tree
     QgsSearchString( const QgsSearchString& str );