[pclasses-cvs] pclasses2/src/Unicode String.cpp,1.8,1.9

[Christian P. <cp...@us...>]

Update of /cvsroot/pclasses/pclasses2/src/Unicode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv406/src/Unicode

Modified Files:
	String.cpp 
Log Message:
- Fix for the removed SharedPtr::operator bool() 

Index: String.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/Unicode/String.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- String.cpp	24 May 2005 02:32:59 -0000	1.8
+++ String.cpp	24 May 2005 03:08:21 -0000	1.9
@@ -71,7 +71,7 @@
 
 String::String(const String& str, size_t offset, size_t count/*= npos*/)
 {
-	if(!str._data)
+	if(str._data.null())
 		return;
 
 	if(count == npos)
@@ -137,7 +137,7 @@
 
 bool String::null() const throw()
 {
-	return !_data;
+	return _data.null();
 }
 
 void String::setNull() throw()
@@ -147,7 +147,7 @@
 
 bool String::empty() const throw()
 {
-	if(_data)
+	if(!_data.null())
 		return !_data->length;
 
 	return true;
@@ -155,7 +155,7 @@
 
 size_t String::size() const throw()
 {
-	if(_data)
+	if(!_data.null())
 		return u_countChar32(_data->str, _data->length);
 
 	return 0;
@@ -163,7 +163,7 @@
 
 size_t String::capacity() const throw()
 {
-	if(_data)
+	if(!_data.null())
 		return _data->size;
 
 	return 0;
@@ -178,7 +178,7 @@
 	}
 
 	Data* newData = alloc(sz);
-	if(_data)
+	if(!_data.null())
 	{
 		newData->length = _data->length < sz ? _data->length : sz;
 		u_strncpy(newData->str, _data->str, newData->length);
@@ -273,13 +273,13 @@
 
 String& String::append(const String& str)
 {
-	if(!_data || _data->length == 0)
+	if(_data.null() || _data->length == 0)
 	{
 		_data = str._data;
 		return *this;
 	}
 
-	if(!str._data || str._data->length == 0)
+	if(str._data.null() || str._data->length == 0)
 		return *this;
 
 	if(_data->size <= _data->length + str._data->length)
@@ -293,7 +293,7 @@
 
 String& String::append(const Char& ch)
 {
-	if(!_data)
+	if(_data.null())
 		_data = alloc(2);
 	else if(_data->size <= _data->length + 2)
 		resize(_data->length + 2);
@@ -310,10 +310,10 @@
 
 size_t String::find(const String& str, size_t pos/*=0*/) const
 {
-	if(!str._data || !str._data->length)
+	if(str._data.null() || !str._data->length)
 		return 0;
 
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	// get the initial uchar16 offset specified by codepoint pos
@@ -331,7 +331,7 @@
 
 size_t String::find(const Char& ch, size_t pos/*=0*/) const
 {
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	// get the initial uchar16 offset specified by codepoint pos
@@ -351,10 +351,10 @@
 	if(pos==npos)
 		pos = size();
 
-	if(!str._data || !str._data->length)
+	if(str._data.null() || !str._data->length)
 		return pos;
 
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	// get the initial uchar16 offset specified by codepoint pos
@@ -373,7 +373,7 @@
 
 size_t String::rfind(const Char& ch, size_t pos/*=npos*/) const
 {
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	if(pos==npos)
@@ -394,10 +394,10 @@
 
 size_t String::find_first_of(const String& str, size_t pos/*=0*/) const
 {
-	if(!str._data || !str._data->length)
+	if(str._data.null() || !str._data->length)
 		return npos;
 
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	// get the initial uchar16 offset specified by codepoint pos
@@ -432,14 +432,14 @@
 
 size_t String::find_first_not_of(const String& str, size_t pos) const
 {
-	if(!str._data || !str._data->length)
+	if(str._data.null() || !str._data->length)
 	{
 		// strange .. but we aim for std::string compability...
-		if(_data && _data->length)
+		if(!_data.null() && _data->length)
 			return 0;
 	}
 
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	// get the initial uchar16 offset specified by codepoint pos
@@ -477,7 +477,7 @@
 
 size_t String::find_first_not_of(const Char& ch, size_t pos) const
 {
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	// get the initial uchar16 offset specified by codepoint pos
@@ -501,10 +501,10 @@
 
 size_t String::find_last_of(const String& str, size_t pos /*=npos*/) const
 {
-	if(!str._data || !str._data->length)
+	if(str._data.null() || !str._data->length)
 		return npos;
 
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	if(pos==npos)
@@ -546,10 +546,10 @@
 	if(pos==npos)
 		pos = size();
 
-	if(!str._data || !str._data->length)
+	if(str._data.null() || !str._data->length)
 		return pos - 1;
 
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	// get the initial uchar16 offset specified by codepoint pos
@@ -591,7 +591,7 @@
 	if(pos==npos)
 		pos = size();
 
-	if(!_data || !_data->length)
+	if(_data.null() || !_data->length)
 		return npos;
 
 	// get the initial uchar16 offset specified by codepoint pos
@@ -624,14 +624,14 @@
 
 int String::compare(const String& str) const throw()
 {
-	if(!_data || _data->length == 0)
+	if(_data.null() || _data->length == 0)
 	{
-		if(!str._data || _data->length == 0)
+		if(str._data.null() || _data->length == 0)
 			return 0;
 
 		return -1;
 	}
-	else if(!str._data || _data->length == 0)
+	else if(str._data.null() || _data->length == 0)
 		return +1;
 
 	return u_strCompare(_data->str, _data->length, str._data->str, 
@@ -640,14 +640,14 @@
 
 int String::caseCompare(const String& str) const throw(UnicodeError)
 {
-	if(!_data || _data->length == 0)
+	if(_data.null() || _data->length == 0)
 	{
-		if(!str._data || _data->length == 0)
+		if(str._data.null() || _data->length == 0)
 			return 0;
 
 		return -1;
 	}
-	else if(!str._data || _data->length == 0)
+	else if(str._data.null() || _data->length == 0)
 		return +1;
 
 	UErrorCode errorCode = U_ZERO_ERROR;
@@ -728,7 +728,7 @@
 
 std::string String::ascii() const throw(OutOfMemory)
 {
-	if(!_data || _data->length == 0)
+	if(_data.null() || _data->length == 0)
 		return std::string();
 
 	char* ret = new char[_data->length];
@@ -755,7 +755,7 @@
 
 std::string String::utf8() const throw(OutOfMemory, UnicodeError)
 {
-	if(!_data || _data->length == 0)
+	if(_data.null() || _data->length == 0)
 		return std::string();
 
 	::int32_t resultLen = 0;
@@ -827,7 +827,7 @@
 
 const uchar16_t* String::data() const throw()
 {
-	if(_data)
+	if(!_data.null())
 		return _data->str;
 
 	return 0;