Reviewed by John
authorkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Nov 2004 15:35:56 +0000 (15:35 +0000)
committerkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Nov 2004 15:35:56 +0000 (15:35 +0000)
        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

WebCore/ChangeLog-2005-08-23
WebCore/khtml/editing/htmlediting.cpp
WebCore/khtml/editing/htmlediting.h

index 602c2ab..6506c28 100644 (file)
@@ -1,6 +1,24 @@
 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
         
         Updated some layout test results that changed as a result of my last checking.
         Added a new test that has been in my tree for a few days.
index 83e69b7..cba5ba0 100644 (file)
@@ -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();
index 215eb07..4fbb9da 100644 (file)
@@ -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();