1 files changed, 23 insertions, 23 deletions

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h
index 06545d89..2c9fc860 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h
@@ -31,12 +31,12 @@
 #include <iosfwd>
 #include <string>
 #include "talk/base/scoped_ptr.h"
-#include "talk/xmllite/qname.h"
+#include "talk/xmllite/tqname.h"
 
 namespace buzz {
 
-extern const QName QN_EMPTY;
-extern const QName QN_XMLNS;
+extern const TQName TQN_EMPTY;
+extern const TQName TQN_XMLNS;
 
 
 class XmlChild;
@@ -116,11 +116,11 @@ friend class XmlElement;
 
 public:
   XmlAttr * NextAttr() const { return pNextAttr_; }
-  const QName & Name() const { return name_; }
+  const TQName & Name() const { return name_; }
   const std::string & Value() const { return value_; }
 
 private:
-  explicit XmlAttr(const QName & name, const std::string & value) :
+  explicit XmlAttr(const TQName & name, const std::string & value) :
     pNextAttr_(NULL),
     name_(name),
     value_(value) {
@@ -132,24 +132,24 @@ private:
   }
 
   XmlAttr * pNextAttr_;
-  QName name_;
+  TQName name_;
   std::string value_;
 };
 
 class XmlElement : public XmlChild {
 public:
-  explicit XmlElement(const QName & name);
-  explicit XmlElement(const QName & name, bool useDefaultNs);
+  explicit XmlElement(const TQName & name);
+  explicit XmlElement(const TQName & name, bool useDefaultNs);
   explicit XmlElement(const XmlElement & elt);
 
   virtual ~XmlElement();
 
-  const QName & Name() const { return name_; }
+  const TQName & Name() const { return name_; }
 
   const std::string & BodyText() const;
   void SetBodyText(const std::string & text);
 
-  const QName & FirstElementName() const;
+  const TQName & FirstElementName() const;
 
   XmlAttr * FirstAttr();
   const XmlAttr * FirstAttr() const
@@ -157,10 +157,10 @@ public:
 
   //! Attr will return STR_EMPTY if the attribute isn't there:
   //! use HasAttr to test presence of an attribute. 
-  const std::string & Attr(const QName & name) const;
-  bool HasAttr(const QName & name) const;
-  void SetAttr(const QName & name, const std::string & value);
-  void ClearAttr(const QName & name);
+  const std::string & Attr(const TQName & name) const;
+  bool HasAttr(const TQName & name) const;
+  void SetAttr(const TQName & name, const std::string & value);
+  void ClearAttr(const TQName & name);
 
   XmlChild * FirstChild();
   const XmlChild * FirstChild() const
@@ -182,15 +182,15 @@ public:
   const XmlElement * NextWithNamespace(const std::string & ns) const
     { return const_cast<XmlElement *>(this)->NextWithNamespace(ns); }
 
-  XmlElement * FirstNamed(const QName & name);
-  const XmlElement * FirstNamed(const QName & name) const
+  XmlElement * FirstNamed(const TQName & name);
+  const XmlElement * FirstNamed(const TQName & name) const
     { return const_cast<XmlElement *>(this)->FirstNamed(name); }
 
-  XmlElement * NextNamed(const QName & name);
-  const XmlElement * NextNamed(const QName & name) const
+  XmlElement * NextNamed(const TQName & name);
+  const XmlElement * NextNamed(const TQName & name) const
     { return const_cast<XmlElement *>(this)->NextNamed(name); }
 
-  const std::string & TextNamed(const QName & name) const;
+  const std::string & TextNamed(const TQName & name) const;
 
   void InsertChildAfter(XmlChild * pPredecessor, XmlChild * pNewChild);
   void RemoveChildAfter(XmlChild * pPredecessor);
@@ -200,9 +200,9 @@ public:
   void AddText(const std::string & text, int depth);
   void AddElement(XmlElement * pelChild);
   void AddElement(XmlElement * pelChild, int depth);
-  void AddAttr(const QName & name, const std::string & value);
-  void AddAttr(const QName & name, const std::string & value, int depth);
-  void ClearNamedChildren(const QName & name);
+  void AddAttr(const TQName & name, const std::string & value);
+  void AddAttr(const TQName & name, const std::string & value, int depth);
+  void ClearNamedChildren(const TQName & name);
   void ClearChildren();
 
   static XmlElement * ForStr(const std::string & str);
@@ -216,7 +216,7 @@ protected:
   virtual XmlText * AsTextImpl() const;
 
 private:
-  QName name_;
+  TQName name_;
   XmlAttr * pFirstAttr_;
   XmlAttr * pLastAttr_;
   XmlChild * pFirstChild_;