[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2010-10-27 17:56:47
Message-ID: 20101027175647.A4D60AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1190452 by adawit:

Adjust to the changes in the SelectorInterface class

 M  +21 -3     khtml_ext.cpp  
 M  +2 -2      khtml_ext.h  


--- trunk/KDE/kdelibs/khtml/khtml_ext.cpp #1190451:1190452
@@ -1119,18 +1119,29 @@
     return elem;
 }
 
-KParts::SelectorInterface::Element KHTMLHtmlExtension::querySelector(const QString& \
query) const +KParts::SelectorInterface::Element \
KHTMLHtmlExtension::querySelector(const QString& query, \
KParts::SelectorInterface::QueryMethod method) const  {
+    switch (method) {
+    case KParts::SelectorInterface::EntireContent: {
     int ec = 0; // exceptions are ignored
     WTF::RefPtr<DOM::ElementImpl> element = \
part()->document().handle()->querySelector(query, ec);  return \
convertDomElement(element.get());  }
+    case KParts::SelectorInterface::SelectedContent:
+        // TODO: Implement support for querying only the selected portion of the \
content... +    default:
+        break;
+    }        
+    return KParts::SelectorInterface::Element();    
+}
 
-QList<KParts::SelectorInterface::Element> KHTMLHtmlExtension::querySelectorAll(const \
QString& query) const +QList<KParts::SelectorInterface::Element> \
KHTMLHtmlExtension::querySelectorAll(const QString& query, \
KParts::SelectorInterface::QueryMethod method) const  {
+    QList<KParts::SelectorInterface::Element> result;
+    switch (method) {
+    case KParts::SelectorInterface::EntireContent: {
     int ec = 0; // exceptions are ignored
     WTF::RefPtr<DOM::NodeListImpl> nodes = \
                part()->document().handle()->querySelectorAll(query, ec);
-    QList<Element> result;
     const unsigned long len = nodes->length();
     result.reserve(len);
     for (unsigned long i = 0; i < len; ++i) {
@@ -1139,6 +1150,13 @@
             result.append(convertDomElement(static_cast<DOM::ElementImpl*>(node)));
         }
     }
+        break;
+    }
+    case KParts::SelectorInterface::SelectedContent:
+        // TODO: Implement support for querying only the selected portion of the \
content... +    default:
+        break;
+    }
     return result;
 }
 
--- trunk/KDE/kdelibs/khtml/khtml_ext.h #1190451:1190452
@@ -207,8 +207,8 @@
     virtual KUrl baseUrl() const;
 
     // SelectorInterface
-    virtual Element querySelector(const QString& query) const;
-    virtual QList<Element> querySelectorAll(const QString& query) const;
+    virtual Element querySelector(const QString& query, \
KParts::SelectorInterface::QueryMethod method) const; +    virtual QList<Element> \
querySelectorAll(const QString& query, KParts::SelectorInterface::QueryMethod method) \
const;  
     KHTMLPart* part() const;
 };


[prev in list] [next in list] [prev in thread] [next in thread]