Reviewed by John

        Improved some function names, at John's urging. No changes to the
        functions themselves.

        canPerformSpecialCaseAllContentDelete() --> handleSpecialCaseAllContentDelete()
        canPerformSpecialCaseBRDelete() --> handleSpecialCaseBRDelete()
        performGeneralDelete() --> handleGeneralDelete()

        * khtml/editing/htmlediting.cpp:
        (khtml::DeleteSelectionCommand::handleSpecialCaseAllContentDelete)
        (khtml::DeleteSelectionCommand::handleSpecialCaseBRDelete)
        (khtml::DeleteSelectionCommand::handleGeneralDelete)
        (khtml::DeleteSelectionCommand::doApply)
        * khtml/editing/htmlediting.h

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 602c2abe7ea9263f5f36051a3d37d1946e0b88ed..6506c280a65ce8c91cbb27a992236cfb43d8929b 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2004-11-11  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by John
+
+        Improved some function names, at John's urging. No changes to the
+        functions themselves.
+        
+        canPerformSpecialCaseAllContentDelete() --> handleSpecialCaseAllContentDelete()
+        canPerformSpecialCaseBRDelete() --> handleSpecialCaseBRDelete()
+        performGeneralDelete() --> handleGeneralDelete()
+
+        * khtml/editing/htmlediting.cpp:
+        (khtml::DeleteSelectionCommand::handleSpecialCaseAllContentDelete)
+        (khtml::DeleteSelectionCommand::handleSpecialCaseBRDelete)
+        (khtml::DeleteSelectionCommand::handleGeneralDelete)
+        (khtml::DeleteSelectionCommand::doApply)
+        * khtml/editing/htmlediting.h
+
 2004-11-11  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John

diff --git a/WebCore/khtml/editing/htmlediting.cpp b/WebCore/khtml/editing/htmlediting.cpp
index 83e69b7ba60a62db15448981b25a16fc239d9ac1..cba5ba03251db6d3ae1241daeb5f26b0bc7daecb 100644 (file)
--- a/WebCore/khtml/editing/htmlediting.cpp
+++ b/WebCore/khtml/editing/htmlediting.cpp
@@ -1476,7 +1476,7 @@ void DeleteSelectionCommand::saveTypingStyleState()
     computedStyle->deref();
 }
 
-bool DeleteSelectionCommand::canPerformSpecialCaseAllContentDelete()
+bool DeleteSelectionCommand::handleSpecialCaseAllContentDelete()
 {
     Position start = m_downstreamStart;
     Position end = m_upstreamEnd;
@@ -1497,7 +1497,7 @@ bool DeleteSelectionCommand::canPerformSpecialCaseAllContentDelete()
     return false;
 }
 
-bool DeleteSelectionCommand::canPerformSpecialCaseBRDelete()
+bool DeleteSelectionCommand::handleSpecialCaseBRDelete()
 {
     // Check for special-case where the selection contains only a BR on a line by itself after another BR.
     bool upstreamStartIsBR = m_startNode->id() == ID_BR;
@@ -1529,7 +1529,7 @@ bool DeleteSelectionCommand::canPerformSpecialCaseBRDelete()
     return false;
 }
 
-void DeleteSelectionCommand::performGeneralDelete()
+void DeleteSelectionCommand::handleGeneralDelete()
 {
     int startOffset = m_upstreamStart.offset();
 
@@ -1824,9 +1824,9 @@ void DeleteSelectionCommand::doApply()
 
     saveTypingStyleState();
     
-    if (!canPerformSpecialCaseAllContentDelete())
-        if (!canPerformSpecialCaseBRDelete())
-            performGeneralDelete();
+    if (!handleSpecialCaseAllContentDelete())
+        if (!handleSpecialCaseBRDelete())
+            handleGeneralDelete();
     
     // Do block merge if start and end of selection are in different blocks.
     moveNodesAfterNode();

diff --git a/WebCore/khtml/editing/htmlediting.h b/WebCore/khtml/editing/htmlediting.h
index 215eb079f34159777ad714a31017758195e7e7d9..4fbb9da3aee0a72ba3b366b241c6101fa3690ac9 100644 (file)
--- a/WebCore/khtml/editing/htmlediting.h
+++ b/WebCore/khtml/editing/htmlediting.h
@@ -312,9 +312,9 @@ private:
 
     void initializePositionData();
     void saveTypingStyleState();
-    bool canPerformSpecialCaseAllContentDelete();
-    bool canPerformSpecialCaseBRDelete();
-    void performGeneralDelete();
+    bool handleSpecialCaseAllContentDelete();
+    bool handleSpecialCaseBRDelete();
+    void handleGeneralDelete();
     void fixupWhitespace();
     void moveNodesAfterNode();
     void calculateEndingPosition();