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

List:       kde-commits
Subject:    kdenonbeta/kdom
From:       Laurent Montel <montel () kde ! org>
Date:       2005-11-24 18:28:57
Message-ID: 1132856937.473970.14971.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 483003 by mlaurent:

Q3ValueList--


 M  +8 -8      xinclude/Includer.cpp  
 M  +2 -4      xinclude/Includer.h  
 M  +2 -2      xpointer/ElementSchemeImpl.cpp  
 M  +1 -1      xpointer/ElementSchemeImpl.h  
 M  +1 -1      xpointer/XPointerEvaluatorImpl.cpp  
 M  +1 -1      xpointer/XPointerExpressionImpl.h  


--- trunk/kdenonbeta/kdom/xinclude/Includer.cpp #483002:483003
@@ -120,10 +120,10 @@
     }
 };
 
-Q3ValueList<Node> Includer::xiElements(const NodeList &children)
+QList<Node> Includer::xiElements(const NodeList &children)
 {
     Node current = children.item(0);
-    Q3ValueList<Node> result;
+    QList<Node> result;
 
     Q3ValueStack<Node> nodeStack;
 
@@ -173,7 +173,7 @@
     d->document = document;
     Element documentRoot = d->document.documentElement();
 
-    Q3ValueList<Node> children = xiElements(document.childNodes());
+    QList<Node> children = xiElements(document.childNodes());
     Element xi = children.first();
 
     if(children.isEmpty()) /* Optimize the common case */
@@ -209,8 +209,8 @@
                 "//throw new XIncludeExceptionImpl(FATAL_ERR);" << endl;
     else
     {
-        Q3ValueList<Node>::const_iterator end = children.constEnd();
-        Q3ValueList<Node>::const_iterator it;
+        QList<Node>::const_iterator end = children.constEnd();
+        QList<Node>::const_iterator it;
 
         for(it = children.constBegin(); it != end; ++it)
         {
@@ -241,15 +241,15 @@
     d->performingFallback = true;
     d->fallbackList = list;
 
-    Q3ValueList<Node> children = xiElements(list);
+    QList<Node> children = xiElements(list);
     if(children.isEmpty())
     {
         emit fallbackInclusionFinished(d->fallbackList, hasError());
         return;
     }
 
-    Q3ValueList<Node>::const_iterator end = children.constEnd();
-    Q3ValueList<Node>::const_iterator it;
+    QList<Node>::const_iterator end = children.constEnd();
+    QList<Node>::const_iterator it;
     Node xi;
 
     for(it = children.constBegin(); it != end; ++it)
--- trunk/kdenonbeta/kdom/xinclude/Includer.h #483002:483003
@@ -22,10 +22,8 @@
 #define KDOM_XInclude_Includer_H
 
 #include <qobject.h>
-//Added by qt3to4:
-#include <Q3ValueList>
 
-template <typename Type> class Q3ValueList;
+template <typename Type> class QList;
 
 namespace KDOM
 {
@@ -113,7 +111,7 @@
          *
          * @param fragment the fragment to traverse for XInclude elements.
          */
-        Q3ValueList<Node> xiElements(const NodeList &fragment);
+        QList<Node> xiElements(const NodeList &fragment);
 
         void setHasError(bool state);
 
--- trunk/kdenonbeta/kdom/xpointer/ElementSchemeImpl.cpp #483002:483003
@@ -142,8 +142,8 @@
         resultNode = context; /* Guranteed to be document node. */
 
     Q_ASSERT(resultNode);
-    Q3ValueList<unsigned int>::const_iterator it;
-    Q3ValueList<unsigned int>::const_iterator end(m_childSequence.constEnd());
+    QList<unsigned int>::const_iterator it;
+    QList<unsigned int>::const_iterator end(m_childSequence.constEnd());
 
     for(it = m_childSequence.constBegin(); it != end; ++it)
     {
--- trunk/kdenonbeta/kdom/xpointer/ElementSchemeImpl.h #483002:483003
@@ -56,7 +56,7 @@
         void parseChildSequence(const QStringList &steps);
 
         ShortHandImpl *m_shorthand;
-        Q3ValueList<unsigned int> m_childSequence;
+        QList<unsigned int> m_childSequence;
     };
 };
 
--- trunk/kdenonbeta/kdom/xpointer/XPointerEvaluatorImpl.cpp #483002:483003
@@ -103,7 +103,7 @@
     typedef QPair<DOMString, DOMString> StrPair;
     
     /* A list of pair of SchemeName and SchemeData, all valid. */
-    typedef Q3ValueList<StrPair> StrPairList;
+    typedef QList<StrPair> StrPairList;
     StrPairList pointerParts;
 
     for(unsigned int i = 0; i < length; i++)
--- trunk/kdenonbeta/kdom/xpointer/XPointerExpressionImpl.h #483002:483003
@@ -45,7 +45,7 @@
     class XPointerExpressionImpl : public Shared<XPointerExpressionImpl>
     {
     public:
-        typedef Q3ValueList<PointerPartImpl *> List;
+        typedef QList<PointerPartImpl *> List;
 
         XPointerExpressionImpl(DOMStringImpl *raw, NodeImpl *relatedNode, DocumentImpl *context);
         virtual ~XPointerExpressionImpl();
[prev in list] [next in list] [prev in thread] [next in thread]