Reviewed by Maciej.

        Use CString instead of DeprecatedCString.

        * html/FormDataList.cpp:
        (WebCore::FormDataList::appendString):
        (WebCore::fixLineBreaks):
        (WebCore::FormDataList::appendFile):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17864 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a5ab366eb9867fbb8c97ef2614c6bb19bb1772cf..25c5b23bc42182ed256dd5e7bb62546d97372e1c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-20  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Maciej.
+
+        Use CString instead of DeprecatedCString.
+        
+        * html/FormDataList.cpp:
+        (WebCore::FormDataList::appendString):
+        (WebCore::fixLineBreaks):
+        (WebCore::FormDataList::appendFile):
+
 2006-11-20  Samuel Weinig  <sam@webkit.org>
 
         Reviewed by Alexey.

diff --git a/WebCore/html/FormDataList.cpp b/WebCore/html/FormDataList.cpp
index b11015cce10d73a130e5f51deec10324df8cb539..0116cc40fbe71b117263a439016a3325e8aff00d 100644 (file)
--- a/WebCore/html/FormDataList.cpp
+++ b/WebCore/html/FormDataList.cpp
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "FormDataList.h"
 
-#include "DeprecatedCString.h"
-
 namespace WebCore {
 
 FormDataList::FormDataList(const TextEncoding& c)
@@ -36,13 +34,13 @@ FormDataList::FormDataList(const TextEncoding& c)
 {
 }
 
-void FormDataList::appendString(const CString &s)
+void FormDataList::appendString(const CString& s)
 {
     m_list.append(s);
 }
 
 // Change plain CR and plain LF to CRLF pairs.
-static DeprecatedCString fixLineBreaks(const DeprecatedCString &s)
+static CString fixLineBreaks(const CString &s)
 {
     // Compute the length.
     unsigned newLen = 0;
@@ -68,8 +66,8 @@ static DeprecatedCString fixLineBreaks(const DeprecatedCString &s)
     
     // Make a copy of the string.
     p = s.data();
-    DeprecatedCString result(newLen + 1);
-    char *q = result.data();
+    char *q;
+    CString result = CString::newUninitialized(newLen, q);
     while (char c = *p++) {
         if (c == '\r') {
             // Safe to look ahead because of trailing '\0'.
@@ -92,12 +90,11 @@ static DeprecatedCString fixLineBreaks(const DeprecatedCString &s)
 
 void FormDataList::appendString(const String& s)
 {
-    DeprecatedCString cstr = fixLineBreaks(m_encoding.encode(s.characters(), s.length(), true).deprecatedCString());
-    cstr.truncate(cstr.length());
-    m_list.append(CString(cstr));
+    CString cstr = fixLineBreaks(m_encoding.encode(s.characters(), s.length(), true));
+    m_list.append(cstr);
 }
 
-void FormDataList::appendFile(const String &key, const String &filename)
+void FormDataList::appendFile(const String& key, const String& filename)
 {
     appendString(key);
     m_list.append(filename);