2009-04-28 Simon Hausmann <simon.hausmann@nokia.com>

        Reviewed by Tor Arne Vestbø.

        QWebElement API changes after another round of API review:

        * Fix argument names of findAll/findFirst
        * Split up toXml into innerXml and outerXml
        * Removed confusing toggleClass overload
        * Fixed casing of namespaceUri to follow QXmlStreamReader
        * Removed tagName from firstChild/nextSibling/etc.
        * Renamed append/prepend/insertAfter/insertBefore to [append|prepend][Inside|Outside]
        * Renamed wrapWith() back to wrap()
        * Made clone() const
        * Renamed remove() to takeFromDocument(), added removeFromDocument()
        * Renamed clear() to removeChildren()
        * Renamed scriptsFunctions/callScriptFunction to functions()/callFunction()
        * Renamed scriptProperty to scriptableProperty

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

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

@@ -47,19 +47,17 @@ public:
 
     bool isNull() const;
 
-    QWebElementCollection findAll(const QString &query) const;
-    QWebElement findFirst(const QString &query) const;
+    QWebElementCollection findAll(const QString &selectorQuery) const;
+    QWebElement findFirst(const QString &selectorQuery) const;
 
     void setPlainText(const QString &text);
     QString toPlainText() const;
 
-    enum XmlScope {
-        InnerXml,
-        OuterXml
-    };
+    void setOuterXml(const QString &markup);
+    QString toOuterXml() const;
 
-    void setXml(XmlScope scope, const QString &markup);
-    QString toXml(XmlScope scope) const;
+    void setInnerXml(const QString &markup);
+    QString toInnerXml() const;
 
     void setAttribute(const QString &name, const QString &value);
     void setAttributeNS(const QString &namespaceUri, const QString &name, const QString &value);
@@ -76,52 +74,57 @@ public:
     void addClass(const QString &name);
     void removeClass(const QString &name);
     void toggleClass(const QString &name);
-    void toggleClass(const QString &name, bool enabled);
 
     QRect geometry() const;
 
     QString tagName() const;
     QString prefix() const;
     QString localName() const;
-    QString namespaceURI() const;
+    QString namespaceUri() const;
 
     QWebElement parent() const;
-    QWebElement firstChild(const QString &tagName = QString()) const;
-    QWebElement lastChild(const QString &tagName = QString()) const;
-    QWebElement nextSibling(const QString &tagName = QString()) const;
-    QWebElement previousSibling(const QString &tagName = QString()) const;
+    QWebElement firstChild() const;
+    QWebElement lastChild() const;
+    QWebElement nextSibling() const;
+    QWebElement previousSibling() const;
     QWebElement document() const;
     QWebFrame *webFrame() const;
 
     // TODO: Add QWebElementCollection overloads
-    void append(const QString &markup);
-    void append(QWebElement element);
+    // docs need example snippet
+    void appendInside(const QString &markup);
+    void appendInside(const QWebElement &element);
 
-    void prepend(const QString &markup);
-    void prepend(QWebElement element);
+    // docs need example snippet
+    void prependInside(const QString &markup);
+    void prependInside(const QWebElement &element);
 
-    void insertBefore(const QString &markup);
-    void insertBefore(QWebElement element);
+    // docs need example snippet
+    void appendOutside(const QString &markup);
+    void appendOutside(const QWebElement &element);
 
-    void insertAfter(const QString &markup);
-    void insertAfter(QWebElement element);
+    // docs need example snippet
+    void prependOutside(const QString &markup);
+    void prependOutside(const QWebElement &element);
 
+    // docs need example snippet
     void wrap(const QString &markup);
-    void wrap(QWebElement element);
+    void wrap(const QWebElement &element);
 
-    void replaceWith(const QString &markup);
-    void replaceWith(QWebElement element);
+    void replace(const QString &markup);
+    void replace(const QWebElement &element);
 
-    QWebElement clone();
-    QWebElement &remove();
-    void clear();
+    QWebElement clone() const;
+    QWebElement &takeFromDocument();
+    void removeFromDocument();
+    void removeChildren();
 
-    QVariant callScriptFunction(const QString &name, const QVariantList &arguments = QVariantList());
-    QStringList scriptFunctions() const;
+    QVariant callFunction(const QString &functionName, const QVariantList &arguments = QVariantList());
+    QStringList functions() const;
 
-    QVariant scriptProperty(const QString &name) const;
-    void setScriptProperty(const QString &name, const QVariant &value);
-    QStringList scriptProperties() const;
+    QVariant scriptableProperty(const QString &name) const;
+    void setScriptableProperty(const QString &name, const QVariant &value);
+    QStringList scriptableProperties() const;
 
     QString styleProperty(const QString &name) const;
     void setStyleProperty(const QString &name, const QString &value);

third_party/WebKit/WebKit/qt/Api/qwebframe.cpp

@@ -983,22 +983,22 @@ QWebElement QWebFrame::documentElement() const
 /*!
     \since 4.6
     Returns a new collection of elements that are children of the frame's
-    document element and that match the given CSS selector \a query.
+    document element and that match the given CSS selector \a selectorQuery.
 */
-QWebElementCollection QWebFrame::findAllElements(const QString &query) const
+QWebElementCollection QWebFrame::findAllElements(const QString &selectorQuery) const
 {
-    return documentElement().findAll(query);
+    return documentElement().findAll(selectorQuery);
 }
 
 /*!
     \since 4.6
     Returns the first element in the frame's document that matches the
-    given CSS selector \a query. Returns a null element if there is no
+    given CSS selector \a selectorQuery. Returns a null element if there is no
     match.
 */
-QWebElement QWebFrame::findFirstElement(const QString &query) const
+QWebElement QWebFrame::findFirstElement(const QString &selectorQuery) const
 {
-    return documentElement().findFirst(query);
+    return documentElement().findFirst(selectorQuery);
 }
 
 /*!

third_party/WebKit/WebKit/qt/Api/qwebframe.h

@@ -179,8 +179,8 @@ public:
     QSize contentsSize() const;
 
     QWebElement documentElement() const;
-    QWebElementCollection findAllElements(const QString &query) const;
-    QWebElement findFirstElement(const QString &query) const;
+    QWebElementCollection findAllElements(const QString &selectorQuery) const;
+    QWebElement findFirstElement(const QString &selectorQuery) const;
 
     QWebHitTestResult hitTestContent(const QPoint &pos) const;
 

third_party/WebKit/WebKit/qt/ChangeLog

+2009-04-28  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        QWebElement API changes after another round of API review:
+
+        * Fix argument names of findAll/findFirst
+        * Split up toXml into innerXml and outerXml
+        * Removed confusing toggleClass overload
+        * Fixed casing of namespaceUri to follow QXmlStreamReader
+        * Removed tagName from firstChild/nextSibling/etc.
+        * Renamed append/prepend/insertAfter/insertBefore to [append|prepend][Inside|Outside]
+        * Renamed wrapWith() back to wrap()
+        * Made clone() const
+        * Renamed remove() to takeFromDocument(), added removeFromDocument()
+        * Renamed clear() to removeChildren()
+        * Renamed scriptsFunctions/callScriptFunction to functions()/callFunction()
+        * Renamed scriptProperty to scriptableProperty
+
+        * Api/qwebelement.cpp:
+        (QWebElement::findAll):
+        (QWebElement::findFirst):
+        (QWebElement::setOuterXml):
+        (QWebElement::toOuterXml):
+        (QWebElement::setInnerXml):
+        (QWebElement::toInnerXml):
+        (QWebElement::namespaceUri):
+        (QWebElement::firstChild):
+        (QWebElement::lastChild):
+        (QWebElement::nextSibling):
+        (QWebElement::previousSibling):
+        (QWebElement::callFunction):
+        (QWebElement::functions):
+        (QWebElement::scriptableProperty):
+        (QWebElement::setScriptableProperty):
+        (QWebElement::scriptableProperties):
+        (QWebElement::appendInside):
+        (QWebElement::prependInside):
+        (QWebElement::prependOutside):
+        (QWebElement::appendOutside):
+        (QWebElement::clone):
+        (QWebElement::takeFromDocument):
+        (QWebElement::removeFromDocument):
+        (QWebElement::removeChildren):
+        (QWebElement::wrap):
+        (QWebElement::replace):
+        * Api/qwebelement.h:
+        * Api/qwebframe.cpp:
+        (QWebFrame::findAllElements):
+        (QWebFrame::findFirstElement):
+        * Api/qwebframe.h:
+        * tests/qwebelement/tst_qwebelement.cpp:
+        (tst_QWebElement::textHtml):
+        (tst_QWebElement::classes):
+        (tst_QWebElement::namespaceURI):
+        (tst_QWebElement::foreachManipulation):
+        (tst_QWebElement::callFunction):
+        (tst_QWebElement::callFunctionSubmitForm):
+        (tst_QWebElement::functionNames):
+        (tst_QWebElement::properties):
+        (tst_QWebElement::appendAndPrepend):
+        (tst_QWebElement::insertBeforeAndAfter):
+        (tst_QWebElement::remove):
+        (tst_QWebElement::clear):
+        (tst_QWebElement::replaceWith):
+
 2009-04-28  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Reviewed by Tor Arne Vestbø.