[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 1de94b2c220433d63b930698e8db774cca7437bc
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 24 23:36:48 2001 +0000

    Added more tests
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@191 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQDict.h b/WebCore/kwq/KWQDict.h
index e784cb5..fd7d0d6 100644
--- a/WebCore/kwq/KWQDict.h
+++ b/WebCore/kwq/KWQDict.h
@@ -30,9 +30,17 @@
 #include <config.h>
 #endif
 
+// _KWQ_COMPLETE_ ==============================================================
+
+#ifdef _KWQ_COMPLETE_
+#include <_qdict.h>
+#else
+
+
 #include <_qcollection.h>
 #include "qstring.h"
 
+
 // class QDict =================================================================
 
 template <class T> class QDict : public QCollection {
@@ -116,4 +124,6 @@ private:
 
 }; // class QDictIterator ======================================================
 
+#endif // _KWQ_COMPLETE_
+
 #endif
diff --git a/WebCore/kwq/qt/_qstack.h b/WebCore/kwq/qt/_qstack.h
index ccb16ec..55f3446 100644
--- a/WebCore/kwq/qt/_qstack.h
+++ b/WebCore/kwq/qt/_qstack.h
@@ -45,6 +45,7 @@
 #endif
 
 #include <KWQDef.h>
+#include <iostream>
 
 // -------------------------------------------------------------------------
 
@@ -72,9 +73,34 @@ public:
     type *top()	    const		{ return (type *)QGList::cfirst(); }
 	  operator type *() const	{ return (type *)QGList::cfirst(); }
     type *current() const		{ return (type *)QGList::cfirst(); }
+    
 private:
     void  deleteItem( Item d ) { if ( del_item ) delete (type *)d; }
 };
 
+#ifdef _KWQ_IOSTREAM_
+template<class T>
+inline ostream &operator<<(ostream &o, const QStack<T> &p)
+{
+    QStack<T> copy = QStack<T>(p);
+    int count = p.count();
+
+    o << "QStack: [size: " << 
+    count <<
+    "; items: ";
+
+    for (int i = 0; i < count; i++) {
+        o << *(copy.pop());
+        if (i < count - 1) {
+            o << ", ";
+        }
+    }
+
+    o << "]";
+
+    return o;
+}
+#endif
+
 
 #endif // QSTACK_H
diff --git a/WebCore/kwq/qt/_qvector.h b/WebCore/kwq/qt/_qvector.h
index ae18f62..6b55f28 100644
--- a/WebCore/kwq/qt/_qvector.h
+++ b/WebCore/kwq/qt/_qvector.h
@@ -115,7 +115,7 @@ inline ostream &operator<<(ostream &o, const QVector<T> &p)
     o << "]";
 
     return o;
-    }
+}
 #endif
 
 
diff --git a/WebCore/kwq/qt/qdict.h b/WebCore/kwq/qt/qdict.h
index e784cb5..fd7d0d6 100644
--- a/WebCore/kwq/qt/qdict.h
+++ b/WebCore/kwq/qt/qdict.h
@@ -30,9 +30,17 @@
 #include <config.h>
 #endif
 
+// _KWQ_COMPLETE_ ==============================================================
+
+#ifdef _KWQ_COMPLETE_
+#include <_qdict.h>
+#else
+
+
 #include <_qcollection.h>
 #include "qstring.h"
 
+
 // class QDict =================================================================
 
 template <class T> class QDict : public QCollection {
@@ -116,4 +124,6 @@ private:
 
 }; // class QDictIterator ======================================================
 
+#endif // _KWQ_COMPLETE_
+
 #endif
diff --git a/WebCore/kwq/tests/test.list b/WebCore/kwq/tests/test.list
index be692b0..fbf3819 100644
--- a/WebCore/kwq/tests/test.list
+++ b/WebCore/kwq/tests/test.list
@@ -5,8 +5,14 @@ qt/qcstring-test
 qt/qrect-test
 qt/qarray-test
 qt/qmap-test
+qt/qdict-test
+qt/qptrdict-test
+qt/qstack-test
 qt/qvaluelist-test
 qt/qstringlist-test
 qt/qlist-test
 qt/qregexp-test
 qt/qchar-test
+qt/qdate-test
+qt/qtime-test
+qt/qdatetime-test
diff --git a/WebCore/src/kwq/qt/_qstack.h b/WebCore/src/kwq/qt/_qstack.h
index ccb16ec..55f3446 100644
--- a/WebCore/src/kwq/qt/_qstack.h
+++ b/WebCore/src/kwq/qt/_qstack.h
@@ -45,6 +45,7 @@
 #endif
 
 #include <KWQDef.h>
+#include <iostream>
 
 // -------------------------------------------------------------------------
 
@@ -72,9 +73,34 @@ public:
     type *top()	    const		{ return (type *)QGList::cfirst(); }
 	  operator type *() const	{ return (type *)QGList::cfirst(); }
     type *current() const		{ return (type *)QGList::cfirst(); }
+    
 private:
     void  deleteItem( Item d ) { if ( del_item ) delete (type *)d; }
 };
 
+#ifdef _KWQ_IOSTREAM_
+template<class T>
+inline ostream &operator<<(ostream &o, const QStack<T> &p)
+{
+    QStack<T> copy = QStack<T>(p);
+    int count = p.count();
+
+    o << "QStack: [size: " << 
+    count <<
+    "; items: ";
+
+    for (int i = 0; i < count; i++) {
+        o << *(copy.pop());
+        if (i < count - 1) {
+            o << ", ";
+        }
+    }
+
+    o << "]";
+
+    return o;
+}
+#endif
+
 
 #endif // QSTACK_H
diff --git a/WebCore/src/kwq/qt/_qvector.h b/WebCore/src/kwq/qt/_qvector.h
index ae18f62..6b55f28 100644
--- a/WebCore/src/kwq/qt/_qvector.h
+++ b/WebCore/src/kwq/qt/_qvector.h
@@ -115,7 +115,7 @@ inline ostream &operator<<(ostream &o, const QVector<T> &p)
     o << "]";
 
     return o;
-    }
+}
 #endif
 
 
diff --git a/WebCore/src/kwq/qt/qdict.h b/WebCore/src/kwq/qt/qdict.h
index e784cb5..fd7d0d6 100644
--- a/WebCore/src/kwq/qt/qdict.h
+++ b/WebCore/src/kwq/qt/qdict.h
@@ -30,9 +30,17 @@
 #include <config.h>
 #endif
 
+// _KWQ_COMPLETE_ ==============================================================
+
+#ifdef _KWQ_COMPLETE_
+#include <_qdict.h>
+#else
+
+
 #include <_qcollection.h>
 #include "qstring.h"
 
+
 // class QDict =================================================================
 
 template <class T> class QDict : public QCollection {
@@ -116,4 +124,6 @@ private:
 
 }; // class QDictIterator ======================================================
 
+#endif // _KWQ_COMPLETE_
+
 #endif
diff --git a/WebCore/src/kwq/tests/test.list b/WebCore/src/kwq/tests/test.list
index be692b0..fbf3819 100644
--- a/WebCore/src/kwq/tests/test.list
+++ b/WebCore/src/kwq/tests/test.list
@@ -5,8 +5,14 @@ qt/qcstring-test
 qt/qrect-test
 qt/qarray-test
 qt/qmap-test
+qt/qdict-test
+qt/qptrdict-test
+qt/qstack-test
 qt/qvaluelist-test
 qt/qstringlist-test
 qt/qlist-test
 qt/qregexp-test
 qt/qchar-test
+qt/qdate-test
+qt/qtime-test
+qt/qdatetime-test

-- 
WebKit Debian packaging