Mnemonics in "Fill and stroke", "Align and distribute", and "Transform" dialogs ...

[inkscape.git] / src / dom / xpathparser.cpp

diff --git a/src/dom/xpathparser.cpp b/src/dom/xpathparser.cpp
index abbbb090060da6ec5506b4810b13e7ce6f3838dd..bbe0fcc40c98f4d2d2c0a75a36b2239a9b1fe296 100644 (file)
--- a/src/dom/xpathparser.cpp
+++ b/src/dom/xpathparser.cpp
@@ -10,7 +10,7 @@
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2006 Bob Jamison
+ * Copyright (C) 2006-2007 Bob Jamison
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
  */
 
 
-#include "charclass.h"
+#include "ucd.h"
 #include "xpathparser.h"
 
 
@@ -187,7 +187,7 @@ int XPathParser::skipwhite(int p0)
     while (p < parselen)
         {
         int ch = peek(p);
-        if (!isWhitespace(ch))
+        if (!uni_is_space(ch))
             break;
         ch = get(p++);
         }
@@ -200,7 +200,7 @@ int XPathParser::getword(int p0, DOMString &str)
     while (p < parselen)
         {
         int ch = peek(p);
-        if (!isLetterOrDigit(ch))
+        if (!uni_is_letter_or_digit(ch))
             break;
         ch = get(p++);
         str.push_back((XMLCh)ch);
@@ -270,7 +270,7 @@ int XPathParser::getNumber(int p0, double &dresult)
                 return p0;
             seen_eminus = true;
             }
-        else if (!isDigit(ch))
+        else if (!uni_is_digit(ch))
             break;
         num.push_back((XMLCh)ch);
         i++;
@@ -344,7 +344,7 @@ int XPathParser::getNCName(int p0, DOMString &result)
 {
     int p = p0;
     int ch = peek(p);
-    if (ch != '_' && !isLetter(ch))
+    if (ch != '_' && !uni_is_letter(ch))
         return p0;
 
     result.push_back((XMLCh)ch);
@@ -352,9 +352,9 @@ int XPathParser::getNCName(int p0, DOMString &result)
     while (p < parselen)
         {
         ch = peek(p);
-        if (   isLetterOrDigit(ch) ||
-               isCombiningChar(ch) ||
-               isExtender(ch)      ||
+        if (   uni_is_letter_or_digit(ch) ||
+               // isCombiningChar(ch) ||
+               // isExtender(ch)      ||
                ch == '.' || ch == '-' || ch == '_' )
            {
            result.push_back((XMLCh)ch);
@@ -2051,7 +2051,7 @@ bool XPathParser::parse(const DOMString &xpathString)
  * This wraps the two-step call to parse(), then execute() to get a NodeList
  * of matching DOM nodes
  */
-NodeList XPathParser::evaluate(const Node *root,
+NodeList XPathParser::evaluate(const NodePtr root,
                                const DOMString &xpathString)
 {
     NodeList list;