(file) Return to String.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/String.cpp between version 1.77 and 1.78

version 1.77, 2003/09/10 19:40:16 version 1.78, 2003/09/16 12:38:21
Line 463 
Line 463 
 } }
  
 // ATTN-RK-P3-20020509: Define case-sensitivity for non-English characters // ATTN-RK-P3-20020509: Define case-sensitivity for non-English characters
   // ATTN-CEC-20030913: ICU code added, but uses the server's locale.  Look at adding
   // a toLower( ) with Locale parameter - like ICU's toLower( )
 void String::toLower() void String::toLower()
 { {
 #ifdef PEGASUS_HAS_ICU #ifdef PEGASUS_HAS_ICU
     Char16* utf16str;     Char16* utf16str;
     UnicodeString UniStr((const UChar *)_rep->c16a.getData(), (int32_t)size());      UnicodeString UniStr((const UChar *)_rep->c16a.getData());
     UniStr.append((UChar)'\0');      UniStr.toLower();
     UniStr = UniStr.toLower();      UniStr.append((UChar)'\0');  // ATTN - must be after toLower, but before getTerminatedBuffer
                                    // We should not need to do this!
     utf16str = (Char16 *)UniStr.getTerminatedBuffer();     utf16str = (Char16 *)UniStr.getTerminatedBuffer();
     assign(utf16str);     assign(utf16str);
     // DEVELOPER NOTE: do not delete utf16str, this is handled by ICU     // DEVELOPER NOTE: do not delete utf16str, this is handled by ICU
   
 #else #else
     for (Char16* p = &_rep->c16a[0]; *p; p++)     for (Char16* p = &_rep->c16a[0]; *p; p++)
     {     {
Line 525 
Line 527 
 #ifdef PEGASUS_HAS_ICU #ifdef PEGASUS_HAS_ICU
     UnicodeString UniStr1((const UChar *)s1.getChar16Data(), (int32_t)s1.size());     UnicodeString UniStr1((const UChar *)s1.getChar16Data(), (int32_t)s1.size());
     UnicodeString UniStr2((const UChar *)s2.getChar16Data(), (int32_t)s2.size());     UnicodeString UniStr2((const UChar *)s2.getChar16Data(), (int32_t)s2.size());
     UniStr1 = UniStr1.toLower();      UniStr1.toLower();
     UniStr2 = UniStr2.toLower();      UniStr2.toLower();
     return (UniStr2.compare(UniStr1));     return (UniStr2.compare(UniStr1));
 #else #else
     const Char16* _s1 = s1.getChar16Data();     const Char16* _s1 = s1.getChar16Data();
Line 569 
Line 571 
 #ifdef PEGASUS_HAS_ICU #ifdef PEGASUS_HAS_ICU
     UnicodeString UniStr1((const UChar *)str1.getChar16Data(), (int32_t)str1.size());     UnicodeString UniStr1((const UChar *)str1.getChar16Data(), (int32_t)str1.size());
     UnicodeString UniStr2((const UChar *)str2.getChar16Data(), (int32_t)str2.size());     UnicodeString UniStr2((const UChar *)str2.getChar16Data(), (int32_t)str2.size());
     UniStr1 = UniStr1.toLower();      UniStr1.toLower();
     UniStr2 = UniStr2.toLower();      UniStr2.toLower();
     return (UniStr1 == UniStr2);     return (UniStr1 == UniStr2);
 #else #else
     if (str1.size() != str2.size())     if (str1.size() != str2.size())
Line 684 
Line 686 
         special characters in the pattern: *?\[] (see the manual         special characters in the pattern: *?\[] (see the manual
         entry for details on what these mean).         entry for details on what these mean).
  
   
   Side effects: None.   Side effects: None.
  */  */
  
Line 887 
Line 890 
     os << buf;     os << buf;
     os.flush();     os.flush();
     delete [] buf;     delete [] buf;
   
 #else #else
  
  

Legend:
Removed from v.1.77  
changed lines
  Added in v.1.78
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2