Reviewed by John

        Changed name of constant from KHTMLInterchangeNewline to AppleInterchangeNewline.
        I discussed this with Hyatt and he agreed that going with "Apple" names was OK.

        * khtml/editing/html_interchange.h: Name change, as described above.
        * khtml/editing/htmlediting.cpp:
        (khtml::ReplacementFragment::isInterchangeNewlineComment): Ditto.
        * khtml/xml/dom2_rangeimpl.cpp:
        (DOM::RangeImpl::toHTML): Ditto.

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c15b24e9f1619ae946d240cb8159e5cb504dc395..208d8c8b72fefa1e58baa1a020cf1c14609beb78 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2004-12-07  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by John
+
+        Changed name of constant from KHTMLInterchangeNewline to AppleInterchangeNewline.
+        I discussed this with Hyatt and he agreed that going with "Apple" names was OK.
+
+        * khtml/editing/html_interchange.h: Name change, as described above.
+        * khtml/editing/htmlediting.cpp:
+        (khtml::ReplacementFragment::isInterchangeNewlineComment): Ditto.
+        * khtml/xml/dom2_rangeimpl.cpp:
+        (DOM::RangeImpl::toHTML): Ditto.
+
 2004-12-07  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by me

diff --git a/WebCore/khtml/editing/html_interchange.h b/WebCore/khtml/editing/html_interchange.h
index b5e9579375c484895e050077ede071021162e415..76d46fe7f3e3c9821926441a75ef4b76c46601b1 100644 (file)
--- a/WebCore/khtml/editing/html_interchange.h
+++ b/WebCore/khtml/editing/html_interchange.h
@@ -28,7 +28,7 @@
 
 class QString;
 
-#define KHTMLInterchangeNewline   "KHTMLInterchangeNewline"
+#define AppleInterchangeNewline   "Apple-interchange-newline"
 #define AppleConvertedSpace       "Apple-converted-space"
 
 enum EAnnotateForInterchange { DoNotAnnotateForInterchange, AnnotateForInterchange };

diff --git a/WebCore/khtml/editing/htmlediting.cpp b/WebCore/khtml/editing/htmlediting.cpp
index d5ea1271ffb47e722f85763ec537bd4e755a1199..8a32b2383f4ebdc6149c5b85acbe8d9aec5c14bb 100644 (file)
--- a/WebCore/khtml/editing/htmlediting.cpp
+++ b/WebCore/khtml/editing/htmlediting.cpp
@@ -3126,7 +3126,7 @@ void ReplacementFragment::pruneEmptyNodes()
 
 bool ReplacementFragment::isInterchangeNewlineComment(const NodeImpl *node)
 {
-    return isComment(node) && node->nodeValue() == KHTMLInterchangeNewline;
+    return isComment(node) && node->nodeValue() == AppleInterchangeNewline;
 }
 
 bool ReplacementFragment::isInterchangeConvertedSpaceSpan(const NodeImpl *node)

diff --git a/WebCore/khtml/xml/dom2_rangeimpl.cpp b/WebCore/khtml/xml/dom2_rangeimpl.cpp
index 82214c4c5ee772c0f61ce80b86a86c6cd5a7b441..7c00d35d72d9db7d95bb0bc1f2847b5241bee396 100644 (file)
--- a/WebCore/khtml/xml/dom2_rangeimpl.cpp
+++ b/WebCore/khtml/xml/dom2_rangeimpl.cpp
@@ -955,7 +955,7 @@ DOMString RangeImpl::toHTML(QPtrList<NodeImpl> *nodes, EAnnotateForInterchange a
         NodeImpl *block = pos.node()->enclosingBlockFlowElement();
         NodeImpl *upstreamBlock = pos.upstream().node()->enclosingBlockFlowElement();
         if (block != upstreamBlock) {
-            addCommentToHTMLMarkup(KHTMLInterchangeNewline, markups, AppendToMarkup);    
+            addCommentToHTMLMarkup(AppleInterchangeNewline, markups, AppendToMarkup);    
         }
     }