[escher] Rename deleteSelectedText -> deleteSelection

escher/include/escher/text_area.h

@@ -120,7 +120,7 @@ protected:
     bool removePreviousGlyph() override;
     bool removeEndOfLine() override;
     bool removeStartOfLine();
-    size_t deleteSelectedText() override;
+    size_t deleteSelection() override;
   protected:
     KDRect glyphFrameAtPosition(const char * text, const char * position) const override;
     Text m_text;

escher/include/escher/text_field.h

@@ -65,7 +65,7 @@ protected:
     bool removeEndOfLine() override;
     void willModifyTextBuffer();
     void didModifyTextBuffer();
-    size_t deleteSelectedText() override;
+    size_t deleteSelection() override;
     /* In some app (ie Calculation), text fields record expression results whose
      * lengths can reach 70 (ie
      * [[1.234567e-123*e^(1.234567e-123*i), 1.234567e-123*e^(1.234567e-123*i)]]).

escher/include/escher/text_input.h

@@ -16,7 +16,7 @@ public:
   bool setCursorLocation(const char * location);
   virtual void scrollToCursor();
   void resetSelection() { contentView()->resetSelection(); }
-  void deleteSelectedText();
+  void deleteSelection();
 protected:
   class ContentView : public View {
   public:
@@ -42,7 +42,7 @@ protected:
     void addSelection(const char * left, const char * right);
     bool resetSelection(); // returns true if the selection was indeed reset
     bool selectionIsEmpty() const;
-    virtual size_t deleteSelectedText() = 0;
+    virtual size_t deleteSelection() = 0;
     void reloadRectFromPosition(const char * position, bool includeFollowingLines = false);
     const char * m_selectionStart;
     const char * m_selectionEnd;

escher/src/text_area.cpp

@@ -42,7 +42,7 @@ bool TextArea::handleEventWithText(const char * text, bool indentation, bool for
 
   // Delete the selected text if needed
   if (!contentView()->selectionIsEmpty()) {
-    deleteSelectedText();
+    deleteSelection();
   }
 
   /* Compute the indentation. If the text cannot be inserted with the
@@ -142,7 +142,7 @@ bool TextArea::handleEvent(Ion::Events::Event event) {
     const char * start = contentView()->selectionStart();
     Clipboard::sharedClipboard()->store(start, contentView()->selectionEnd() - start);
     if (event == Ion::Events::Cut) {
-      deleteSelectedText();
+      deleteSelection();
     }
     return true;
   }
@@ -157,7 +157,7 @@ bool TextArea::handleEvent(Ion::Events::Event event) {
         return false;
       }
     } else {
-      deleteSelectedText();
+      deleteSelection();
       return true;
     }
   } else if (event == Ion::Events::Up) {
@@ -168,7 +168,7 @@ bool TextArea::handleEvent(Ion::Events::Event event) {
     contentView()->moveCursorGeo(0, 1);
   } else if (event == Ion::Events::Clear) {
     if (!contentView()->selectionIsEmpty()) {
-      deleteSelectedText();
+      deleteSelection();
       return true;
     } else if (!contentView()->removeEndOfLine()) {
       contentView()->removeStartOfLine();
@@ -518,7 +518,7 @@ bool TextArea::ContentView::removeStartOfLine() {
   return false;
 }
 
-size_t TextArea::ContentView::deleteSelectedText() {
+size_t TextArea::ContentView::deleteSelection() {
   assert(!selectionIsEmpty());
   size_t removedLength = m_text.removeText(m_selectionStart, m_selectionEnd);
   /* We cannot call resetSelection() because m_selectionStart and m_selectionEnd

escher/src/text_field.cpp

@@ -224,7 +224,7 @@ void TextField::ContentView::didModifyTextBuffer() {
   layoutSubviews();
 }
 
-size_t TextField::ContentView::deleteSelectedText() {
+size_t TextField::ContentView::deleteSelection() {
   assert(!selectionIsEmpty());
   assert(m_isEditing);
   size_t removedLength = m_selectionEnd - m_selectionStart;
@@ -348,7 +348,7 @@ bool TextField::privateHandleEvent(Ion::Events::Event event) {
     if (m_contentView.selectionIsEmpty()) {
       return removePreviousGlyph();
     }
-    deleteSelectedText();
+    deleteSelection();
     return true;
   }
   if (event == Ion::Events::Back && isEditing()) {
@@ -361,7 +361,7 @@ bool TextField::privateHandleEvent(Ion::Events::Event event) {
   }
   if (event == Ion::Events::Clear && isEditing()) {
     if (!m_contentView.selectionIsEmpty()) {
-      deleteSelectedText();
+      deleteSelection();
     } else if (!removeEndOfLine()) {
       removeWholeText();
     }
@@ -507,7 +507,7 @@ bool TextField::handleEventWithText(const char * eventText, bool indentation, bo
 
   // Delete the selected text if needed
   if (!contentView()->selectionIsEmpty()) {
-    deleteSelectedText();
+    deleteSelection();
   }
 
   if (eventText[0] == 0) {

escher/src/text_input.cpp

@@ -135,11 +135,11 @@ void TextInput::scrollToCursor() {
   scrollToContentRect(contentView()->cursorRect(), true);
 }
 
-void TextInput::deleteSelectedText() {
+void TextInput::deleteSelection() {
   assert(!contentView()->selectionIsEmpty());
   const char * previousSelectionStart = contentView()->selectionStart();
   const char * previousSelectionEnd = contentView()->selectionEnd();
-  size_t removedLength = contentView()->deleteSelectedText();
+  size_t removedLength = contentView()->deleteSelection();
   if (previousSelectionEnd == contentView()->cursorLocation()) {
     setCursorLocation(contentView()->cursorLocation() - removedLength);
   }