Remove XPathException

Source/core/xml/XPathResult.cpp

 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/xml/XPathResult.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/xml/XPathEvaluator.h"
-#include "core/xml/XPathException.h"
 
 namespace WebCore {
 
 using namespace XPath;
 
 XPathResult::XPathResult(Document* document, const Value& value)
     : m_value(value)
     , m_nodeSetPosition(0)
     , m_domTreeVersion(0)
 {
@@ skipping 38 matching lines @@
             break;
         case BOOLEAN_TYPE:
             m_resultType = type;
             m_value = m_value.toBoolean();
             break;
         case UNORDERED_NODE_ITERATOR_TYPE:
         case UNORDERED_NODE_SNAPSHOT_TYPE:
         case ANY_UNORDERED_NODE_TYPE:
         case FIRST_ORDERED_NODE_TYPE: // This is correct - singleNodeValue() will take care of ordering.
             if (!m_value.isNodeSet()) {
-                ec = XPathException::TYPE_ERR;
+                ec = TypeError;
                 return;
             }
             m_resultType = type;
             break;
         case ORDERED_NODE_ITERATOR_TYPE:
             if (!m_value.isNodeSet()) {
-                ec = XPathException::TYPE_ERR;
+                ec = TypeError;
                 return;
             }
             m_nodeSet.sort();
             m_resultType = type;
             break;
         case ORDERED_NODE_SNAPSHOT_TYPE:
             if (!m_value.isNodeSet()) {
-                ec = XPathException::TYPE_ERR;
+                ec = TypeError;
                 return;
             }
             m_value.toNodeSet().sort();
             m_resultType = type;
             break;
     }
 }
 
 unsigned short XPathResult::resultType() const
 {
     return m_resultType;
 }
 
 double XPathResult::numberValue(ExceptionCode& ec) const
 {
     if (resultType() != NUMBER_TYPE) {
-        ec = XPathException::TYPE_ERR;
+        ec = TypeError;
         return 0.0;
     }
     return m_value.toNumber();
 }
 
 String XPathResult::stringValue(ExceptionCode& ec) const
 {
     if (resultType() != STRING_TYPE) {
-        ec = XPathException::TYPE_ERR;
+        ec = TypeError;
         return String();
     }
     return m_value.toString();
 }
 
 bool XPathResult::booleanValue(ExceptionCode& ec) const
 {
     if (resultType() != BOOLEAN_TYPE) {
-        ec = XPathException::TYPE_ERR;
+        ec = TypeError;
         return false;
     }
     return m_value.toBoolean();
 }
 
 Node* XPathResult::singleNodeValue(ExceptionCode& ec) const
 {
     if (resultType() != ANY_UNORDERED_NODE_TYPE && resultType() != FIRST_ORDERED_NODE_TYPE) {
-        ec = XPathException::TYPE_ERR;
+        ec = TypeError;
         return 0;
     }
   
     const NodeSet& nodes = m_value.toNodeSet();
     if (resultType() == FIRST_ORDERED_NODE_TYPE)
         return nodes.firstNode();
     else
         return nodes.anyNode();
 }
 
 bool XPathResult::invalidIteratorState() const
 {
     if (resultType() != UNORDERED_NODE_ITERATOR_TYPE && resultType() != ORDERED_NODE_ITERATOR_TYPE)
         return false;
 
     ASSERT(m_document);
     return m_document->domTreeVersion() != m_domTreeVersion;
 }
 
 unsigned long XPathResult::snapshotLength(ExceptionCode& ec) const
 {
     if (resultType() != UNORDERED_NODE_SNAPSHOT_TYPE && resultType() != ORDERED_NODE_SNAPSHOT_TYPE) {
-        ec = XPathException::TYPE_ERR;
+        ec = TypeError;
         return 0;
     }
 
     return m_value.toNodeSet().size();
 }
 
 Node* XPathResult::iterateNext(ExceptionCode& ec)
 {
     if (resultType() != UNORDERED_NODE_ITERATOR_TYPE && resultType() != ORDERED_NODE_ITERATOR_TYPE) {
-        ec = XPathException::TYPE_ERR;
+        ec = TypeError;
         return 0;
     }
     
     if (invalidIteratorState()) {
         ec = INVALID_STATE_ERR;
         return 0;
     }
     
     if (m_nodeSetPosition + 1 > m_nodeSet.size())
         return 0;
 
     Node* node = m_nodeSet[m_nodeSetPosition];
     
     m_nodeSetPosition++;
 
     return node;
 }
 
 Node* XPathResult::snapshotItem(unsigned long index, ExceptionCode& ec)
 {
     if (resultType() != UNORDERED_NODE_SNAPSHOT_TYPE && resultType() != ORDERED_NODE_SNAPSHOT_TYPE) {
-        ec = XPathException::TYPE_ERR;
+        ec = TypeError;
         return 0;
     }
     
     const NodeSet& nodes = m_value.toNodeSet();
     if (index >= nodes.size())
         return 0;
     
     return nodes[index];
 }
 
 }