2009-04-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>

        Rubber-stamped by Ariya Hidayat.

        [Qt] Rename QWebElement arguments from html to markup

git-svn-id: svn://svn.chromium.org/blink/trunk@42776 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKit/qt/Api/qwebelement.cpp

@@ -922,13 +922,13 @@ void QWebElement::append(QWebElement element)
 }
 
 /*!
-    Appends the result of parsing \a html as the element's last child.
+    Appends the result of parsing \a markup as the element's last child.
 
     Calling this function on a null element does nothing.
 
     \sa prepend(), insertBefore(), insertAfter()
 */
-void QWebElement::append(const QString &html)
+void QWebElement::append(const QString &markup)
 {
     if (!m_element)
         return;
@@ -937,7 +937,7 @@ void QWebElement::append(const QString &html)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(html);
+    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
 
     ExceptionCode exception = 0;
     m_element->appendChild(fragment, exception);
@@ -964,13 +964,13 @@ void QWebElement::prepend(QWebElement element)
 }
 
 /*!
-    Prepends the result of parsing \a html as the element's first child.
+    Prepends the result of parsing \a markup as the element's first child.
 
     Calling this function on a null element does nothing.
 
     \sa append(), insertBefore(), insertAfter()
 */
-void QWebElement::prepend(const QString &html)
+void QWebElement::prepend(const QString &markup)
 {
     if (!m_element)
         return;
@@ -979,7 +979,7 @@ void QWebElement::prepend(const QString &html)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(html);
+    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
 
     ExceptionCode exception = 0;
     m_element->insertBefore(fragment, m_element->firstChild(), exception);
@@ -1009,13 +1009,13 @@ void QWebElement::insertBefore(QWebElement element)
 }
 
 /*!
-    Inserts the result of parsing \a html before this element.
+    Inserts the result of parsing \a markup before this element.
 
     Calling this function on a null element does nothing.
 
     \sa append(), prepend(), insertAfter()
 */
-void QWebElement::insertBefore(const QString &html)
+void QWebElement::insertBefore(const QString &markup)
 {
     if (!m_element)
         return;
@@ -1027,7 +1027,7 @@ void QWebElement::insertBefore(const QString &html)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(html);
+    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
 
     ExceptionCode exception = 0;
     m_element->parent()->insertBefore(fragment, m_element, exception);
@@ -1059,13 +1059,13 @@ void QWebElement::insertAfter(QWebElement element)
 }
 
 /*!
-    Inserts the result of parsing \a html after this element.
+    Inserts the result of parsing \a markup after this element.
 
     Calling this function on a null element does nothing.
 
     \sa append(), prepend(), insertBefore()
 */
-void QWebElement::insertAfter(const QString &html)
+void QWebElement::insertAfter(const QString &markup)
 {
     if (!m_element)
         return;
@@ -1077,7 +1077,7 @@ void QWebElement::insertAfter(const QString &html)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(html);
+    RefPtr<DocumentFragment> fragment = htmlElement->createContextualFragment(markup);
 
     ExceptionCode exception = 0;
     m_element->parent()->insertBefore(fragment, m_element->nextSibling(), exception);

third_party/WebKit/WebKit/qt/Api/qwebelement.h

@@ -94,22 +94,22 @@ public:
     QWebFrame *webFrame() const;
 
     // TODO: Add QWebElementCollection overloads
-    void append(const QString &html);
+    void append(const QString &markup);
     void append(QWebElement element);
 
-    void prepend(const QString &html);
+    void prepend(const QString &markup);
     void prepend(QWebElement element);
 
-    void insertBefore(const QString &html);
+    void insertBefore(const QString &markup);
     void insertBefore(QWebElement element);
 
-    void insertAfter(const QString &html);
+    void insertAfter(const QString &markup);
     void insertAfter(QWebElement element);
 
-    void wrap(const QString &html);
+    void wrap(const QString &markup);
     void wrap(QWebElement element);
 
-    void replaceWith(const QString &html);
+    void replaceWith(const QString &markup);
     void replaceWith(QWebElement element);
 
     QWebElement clone();

third_party/WebKit/WebKit/qt/ChangeLog

+2009-04-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Rubber-stamped by Ariya Hidayat.
+
+        [Qt] Rename QWebElement arguments from html to markup
+
+        * Api/qwebelement.cpp:
+        (QWebElement::append):
+        (QWebElement::prepend):
+        (QWebElement::insertBefore):
+        (QWebElement::insertAfter):
+        * Api/qwebelement.h:
+
 2009-04-21  Antonio Gomes   <antonio.gomes@openbossa.org>
 
         Reviewed by Ariya Hidayat.