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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 88330f4fa2fe017e411531814a59a70e7af37da5
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 26 22:21:35 2001 +0000

    Added take, clear, count and = methods to qptrdict-test
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@205 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/tests/qt/qptrdict-test.chk b/WebCore/kwq/tests/qt/qptrdict-test.chk
index b3ed2c9..6d84f64 100644
--- a/WebCore/kwq/tests/qt/qptrdict-test.chk
+++ b/WebCore/kwq/tests/qt/qptrdict-test.chk
@@ -1,8 +1,14 @@
-item keyed to 1: 1
-item keyed to 2: 2
-item keyed to 3: 3
-item keyed to 4: 4
-item keyed to 5: 5
-item keyed to 2: 0x0
+d1: QPtrDict: [size: 5; items: (0xbffffa48,4), (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa40,2), (0xbffffa44,3)]
+d1 find 1: 1
+d1 find 2: 2
+d1 find 3: 3
+d1 find 4: 4
+d1 find 5: 5
+d1 take 4: 4
+d1 remove 2: QPtrDict: [size: 3; items: (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa44,3)]
+d1 find 2: 0x0
 d0 is empty: 1
 d1 is empty: 0
+d1 count: 3
+d2 = d1: QPtrDict: [size: 3; items: (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa44,3)]
+d1 clear: QPtrDict: [size: 0; items: ]
diff --git a/WebCore/kwq/tests/qt/qptrdict-test.cpp b/WebCore/kwq/tests/qt/qptrdict-test.cpp
index 47bebff..97dd7dc 100644
--- a/WebCore/kwq/tests/qt/qptrdict-test.cpp
+++ b/WebCore/kwq/tests/qt/qptrdict-test.cpp
@@ -7,30 +7,46 @@ int main() {
 
     QPtrDict<int> d0;
     QPtrDict<int> d1;
+    QPtrDict<int> d2;
 
     int v1 = 1;
     int v2 = 2;
     int v3 = 3;
     int v4 = 4;
     int v5 = 5;
-
+    
     d1.insert(&v1, &v1);
     d1.insert(&v2, &v2);
     d1.insert(&v3, &v3);
     d1.insert(&v4, &v4);
     d1.insert(&v5, &v5);
 
-    cout << "item keyed to 1: " << *(d1.find(&v1)) << endl;
-    cout << "item keyed to 2: " << *(d1.find(&v2)) << endl;
-    cout << "item keyed to 3: " << *(d1.find(&v3)) << endl;
-    cout << "item keyed to 4: " << *(d1.find(&v4)) << endl;
-    cout << "item keyed to 5: " << *(d1.find(&v5)) << endl;
+    
+    cout << "d1: " << d1 << endl;
+    
+    cout << "d1 find 1: " << *(d1.find(&v1)) << endl;
+    cout << "d1 find 2: " << *(d1.find(&v2)) << endl;
+    cout << "d1 find 3: " << *(d1.find(&v3)) << endl;
+    cout << "d1 find 4: " << *(d1.find(&v4)) << endl;
+    cout << "d1 find 5: " << *(d1.find(&v5)) << endl;
+
+    int *n2;
+    n2 = d1.take(&v4);                      
+    cout << "d1 take 4: " << *n2 << endl;
 
     d1.remove(&v2);
-    cout << "item keyed to 2: " << d1.find(&v2) << endl;
+    cout << "d1 remove 2: " << d1 << endl;
+    cout << "d1 find 2: " << d1.find(&v2) << endl;
 
     cout << "d0 is empty: " << d0.isEmpty() << endl;
     cout << "d1 is empty: " << d1.isEmpty() << endl;
 
+    cout << "d1 count: " << d1.count() << endl;
+
+    d2 = d1;
+    cout << "d2 = d1: " << d2 << endl;
+    
+    d1.clear();
+    cout << "d1 clear: " << d1 << endl;
     return 0;
 }
diff --git a/WebCore/src/kwq/tests/qt/qptrdict-test.chk b/WebCore/src/kwq/tests/qt/qptrdict-test.chk
index b3ed2c9..6d84f64 100644
--- a/WebCore/src/kwq/tests/qt/qptrdict-test.chk
+++ b/WebCore/src/kwq/tests/qt/qptrdict-test.chk
@@ -1,8 +1,14 @@
-item keyed to 1: 1
-item keyed to 2: 2
-item keyed to 3: 3
-item keyed to 4: 4
-item keyed to 5: 5
-item keyed to 2: 0x0
+d1: QPtrDict: [size: 5; items: (0xbffffa48,4), (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa40,2), (0xbffffa44,3)]
+d1 find 1: 1
+d1 find 2: 2
+d1 find 3: 3
+d1 find 4: 4
+d1 find 5: 5
+d1 take 4: 4
+d1 remove 2: QPtrDict: [size: 3; items: (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa44,3)]
+d1 find 2: 0x0
 d0 is empty: 1
 d1 is empty: 0
+d1 count: 3
+d2 = d1: QPtrDict: [size: 3; items: (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa44,3)]
+d1 clear: QPtrDict: [size: 0; items: ]
diff --git a/WebCore/src/kwq/tests/qt/qptrdict-test.cpp b/WebCore/src/kwq/tests/qt/qptrdict-test.cpp
index 47bebff..97dd7dc 100644
--- a/WebCore/src/kwq/tests/qt/qptrdict-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qptrdict-test.cpp
@@ -7,30 +7,46 @@ int main() {
 
     QPtrDict<int> d0;
     QPtrDict<int> d1;
+    QPtrDict<int> d2;
 
     int v1 = 1;
     int v2 = 2;
     int v3 = 3;
     int v4 = 4;
     int v5 = 5;
-
+    
     d1.insert(&v1, &v1);
     d1.insert(&v2, &v2);
     d1.insert(&v3, &v3);
     d1.insert(&v4, &v4);
     d1.insert(&v5, &v5);
 
-    cout << "item keyed to 1: " << *(d1.find(&v1)) << endl;
-    cout << "item keyed to 2: " << *(d1.find(&v2)) << endl;
-    cout << "item keyed to 3: " << *(d1.find(&v3)) << endl;
-    cout << "item keyed to 4: " << *(d1.find(&v4)) << endl;
-    cout << "item keyed to 5: " << *(d1.find(&v5)) << endl;
+    
+    cout << "d1: " << d1 << endl;
+    
+    cout << "d1 find 1: " << *(d1.find(&v1)) << endl;
+    cout << "d1 find 2: " << *(d1.find(&v2)) << endl;
+    cout << "d1 find 3: " << *(d1.find(&v3)) << endl;
+    cout << "d1 find 4: " << *(d1.find(&v4)) << endl;
+    cout << "d1 find 5: " << *(d1.find(&v5)) << endl;
+
+    int *n2;
+    n2 = d1.take(&v4);                      
+    cout << "d1 take 4: " << *n2 << endl;
 
     d1.remove(&v2);
-    cout << "item keyed to 2: " << d1.find(&v2) << endl;
+    cout << "d1 remove 2: " << d1 << endl;
+    cout << "d1 find 2: " << d1.find(&v2) << endl;
 
     cout << "d0 is empty: " << d0.isEmpty() << endl;
     cout << "d1 is empty: " << d1.isEmpty() << endl;
 
+    cout << "d1 count: " << d1.count() << endl;
+
+    d2 = d1;
+    cout << "d2 = d1: " << d2 << endl;
+    
+    d1.clear();
+    cout << "d1 clear: " << d1 << endl;
     return 0;
 }

-- 
WebKit Debian packaging