[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 5bf9eee1744ee6213247f4906ff1ecd5689ecdc2
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 11 18:06:35 2004 +0000

            Reviewed by Darin
    
            Javascript execCommand system wants to use case-insensitive QDict.
            The interface for QDict offers this feature, but it was never implemented.
            Now it is.
    
            * kwq/KWQDictImpl.h: Declare bool to store case-sensitive bit.
            * kwq/KWQDictImpl.mm:
            (KWQDictImpl::KWQDictImpl): No longer drops caseSensitive on the floor; stores
            it in instance variable.
            (KWQDictImpl::insert): Make lowercase version of key for operation, if necessary.
            (KWQDictImpl::remove): Ditto.
            (KWQDictImpl::find): Ditto.
            (KWQDictIteratorImpl::currentStringKey): Whitespace cleanup.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6814 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 94d7ea0..161bbd8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2004-06-11  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+        Javascript execCommand system wants to use case-insensitive QDict.
+        The interface for QDict offers this feature, but it was never implemented.
+        Now it is.
+
+        * kwq/KWQDictImpl.h: Declare bool to store case-sensitive bit.
+        * kwq/KWQDictImpl.mm:
+        (KWQDictImpl::KWQDictImpl): No longer drops caseSensitive on the floor; stores
+        it in instance variable.
+        (KWQDictImpl::insert): Make lowercase version of key for operation, if necessary.
+        (KWQDictImpl::remove): Ditto.
+        (KWQDictImpl::find): Ditto.
+        (KWQDictIteratorImpl::currentStringKey): Whitespace cleanup.
+
 === 144 ===
 
 2004-06-10  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebCore/kwq/KWQDictImpl.h b/WebCore/kwq/KWQDictImpl.h
index 5943fbe..90b6b66 100644
--- a/WebCore/kwq/KWQDictImpl.h
+++ b/WebCore/kwq/KWQDictImpl.h
@@ -36,6 +36,9 @@ class KWQDictImpl : public KWQPtrDictImpl {
     void insert(const QString &key, const void *value);
     bool remove(const QString &key, bool deleteItems);
     void *find(const QString &key) const;
+
+private:
+    bool m_caseSensitive;
 };
 
 class KWQDictIteratorImpl : public KWQPtrDictIteratorImpl {
diff --git a/WebCore/kwq/KWQDictImpl.mm b/WebCore/kwq/KWQDictImpl.mm
index e71e221..dbcef59 100644
--- a/WebCore/kwq/KWQDictImpl.mm
+++ b/WebCore/kwq/KWQDictImpl.mm
@@ -27,31 +27,31 @@
 #import <CoreFoundation/CoreFoundation.h>
 
 KWQDictImpl::KWQDictImpl(int size, bool caseSensitive, void (*deleteFunc)(void *)) :
-    KWQPtrDictImpl(size, deleteFunc, &kCFCopyStringDictionaryKeyCallBacks)
+    KWQPtrDictImpl(size, deleteFunc, &kCFCopyStringDictionaryKeyCallBacks), m_caseSensitive(caseSensitive)
 {
 }
 
 void KWQDictImpl::insert(const QString &key, const void *value)
 {
-    KWQPtrDictImpl::insert((void *)key.getCFString(), value);
+    KWQPtrDictImpl::insert((void *)(m_caseSensitive ? key : key.lower()).getCFString(), value);
 }
 
 bool KWQDictImpl::remove(const QString &key, bool deleteItem)
 {
-    return KWQPtrDictImpl::remove((void *)key.getCFString(), deleteItem);
+    return KWQPtrDictImpl::remove((void *)(m_caseSensitive ? key : key.lower()).getCFString(), deleteItem);
 }
 
 void *KWQDictImpl::find(const QString &key) const
 {
-    return KWQPtrDictImpl::find((void *)key.getCFString());
+    return KWQPtrDictImpl::find((void *)(m_caseSensitive ? key : key.lower()).getCFString());
 }
 
 QString KWQDictIteratorImpl::currentStringKey() const
 {
     void *key = currentKey();
 
-    if (key == NULL) {
-	return QString();
-    }
+    if (key == NULL)
+        return QString();
+        
     return QString::fromCFString((CFStringRef)key);
 }

-- 
WebKit Debian packaging