sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a convenience constructor from QString to QgsSearchString

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@13944 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
wonder 2010-07-20 13:21:04 +00:00
parent 50734ac052
commit e9828f8ef3
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/core/qgssearchstring.sip
View File

@ -9,6 +9,10 @@ class QgsSearchString
//! constructor //! constructor
QgsSearchString(); QgsSearchString();
//! construct and parse a string
//! @note added in v1.6
QgsSearchString( const QString & str );
//! copy constructor - makes also copy of search tree //! copy constructor - makes also copy of search tree
QgsSearchString( const QgsSearchString& str ); QgsSearchString( const QgsSearchString& str );

11
src/core/qgssearchstring.cpp
View File

@ -30,6 +30,11 @@ QgsSearchString::QgsSearchString()
mTree = NULL; mTree = NULL;
} }
QgsSearchString::QgsSearchString( const QString & str )
{
mTree = NULL;
setString( str );
}
QgsSearchString::QgsSearchString( const QgsSearchString& str ) QgsSearchString::QgsSearchString( const QgsSearchString& str )
{ {
@ -62,8 +67,10 @@ QgsSearchString::~QgsSearchString()
bool QgsSearchString::setString( QString str ) bool QgsSearchString::setString( QString str )
{ {
mParserErrorMsg.clear();
// empty string // empty string
if ( str == "" ) if ( str.isEmpty() )
{ {
clear(); clear();
return true; return true;
@ -107,5 +114,5 @@ void QgsSearchString::clear()
{ {
delete mTree; delete mTree;
mTree = NULL; mTree = NULL;
mString = ""; mString.clear();
} }

6
src/core/qgssearchstring.h
View File

@ -35,9 +35,13 @@ class QgsSearchTreeNode;
class CORE_EXPORT QgsSearchString class CORE_EXPORT QgsSearchString
{ {
public: public:
//! constructor //! construct an empty string
QgsSearchString(); QgsSearchString();
//! construct and parse a string
//! @note added in v1.6
QgsSearchString( const QString & str );
//! copy constructor - makes also copy of search tree //! copy constructor - makes also copy of search tree
QgsSearchString( const QgsSearchString& str ); QgsSearchString( const QgsSearchString& str );