show waiting cursor while ExecutionEnv is working

[inkscape.git] / src / pedro / pedrodom.cpp

diff --git a/src/pedro/pedrodom.cpp b/src/pedro/pedrodom.cpp
index de6b99cf4534bd7d0650354e39d6e6822217469f..1131e66b8272cdc383092bc03b3acae71712ec84 100644 (file)
--- a/src/pedro/pedrodom.cpp
+++ b/src/pedro/pedrodom.cpp
@@ -4,7 +4,7 @@
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2008 Bob Jamison
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -48,7 +48,7 @@ Element *Element::clone()
     elem->attributes = attributes;
     elem->namespaces = namespaces;
 
-    std::vector<Element *>::iterator iter;
+    ElementList::iterator iter;
     for (iter = children.begin(); iter != children.end() ; iter++)
         {
         elem->addChild((*iter)->clone());
@@ -84,7 +84,7 @@ DOMString Element::getAttribute(const DOMString &name)
 
 DOMString Element::getTagAttribute(const DOMString &tagName, const DOMString &attrName)
 {
-    std::vector<Element *>elems = findElements(tagName);
+    ElementList elems = findElements(tagName);
     if (elems.size() <1)
         return "";
     DOMString res = elems[0]->getAttribute(attrName);
@@ -93,7 +93,7 @@ DOMString Element::getTagAttribute(const DOMString &tagName, const DOMString &at
 
 DOMString Element::getTagValue(const DOMString &tagName)
 {
-    std::vector<Element *>elems = findElements(tagName);
+    ElementList elems = findElements(tagName);
     if (elems.size() <1)
         return "";
     DOMString res = elems[0]->getValue();
@@ -246,7 +246,7 @@ void Parser::getLineAndColumn(long pos, long *lineNr, long *colNr)
 }
 
 
-void Parser::error(char *fmt, ...)
+void Parser::error(char const *fmt, ...)
 {
     long lineNr;
     long colNr;
@@ -652,7 +652,7 @@ int Parser::parseElement(int p0, Element *par,int depth)
     p = getWord(p, closeTagName);
     if (openTagName != closeTagName)
         {
-        error("Mismatched closing tag.  Expected </%S>. Got '%S'.",
+        error("Mismatched closing tag.  Expected </%s>. Got '%s'.",
                 openTagName.c_str(), closeTagName.c_str());
         return p0;
         }