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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit ca8838cd7700fc650f421f8b4c788feeafbd5f77
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 2 21:49:07 2001 +0000

    Use kCFAllocatorDefault instead of NULL and added QChar::null
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@246 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQChar.mm b/WebCore/kwq/KWQChar.mm
index 8fa1c45..15fbd18 100644
--- a/WebCore/kwq/KWQChar.mm
+++ b/WebCore/kwq/KWQChar.mm
@@ -37,12 +37,16 @@ static CFMutableStringRef GetScratchUniCharString()
 
     if (!s) {
         // FIXME: this CFMutableString will be leaked exactly once
-        s = CFStringCreateMutableWithExternalCharactersNoCopy(NULL,
-                &scratchUniChar, 1, 1, kCFAllocatorNull);
+        s = CFStringCreateMutableWithExternalCharactersNoCopy(
+                kCFAllocatorDefault, &scratchUniChar, 1, 1, kCFAllocatorNull);
     }
     return s;
 }
 
+// constants -------------------------------------------------------------------
+
+const QChar QChar::null;
+
 // constructors, copy constructors, and destructors ----------------------------
 
 QChar::QChar()
diff --git a/WebCore/src/kwq/KWQChar.mm b/WebCore/src/kwq/KWQChar.mm
index 8fa1c45..15fbd18 100644
--- a/WebCore/src/kwq/KWQChar.mm
+++ b/WebCore/src/kwq/KWQChar.mm
@@ -37,12 +37,16 @@ static CFMutableStringRef GetScratchUniCharString()
 
     if (!s) {
         // FIXME: this CFMutableString will be leaked exactly once
-        s = CFStringCreateMutableWithExternalCharactersNoCopy(NULL,
-                &scratchUniChar, 1, 1, kCFAllocatorNull);
+        s = CFStringCreateMutableWithExternalCharactersNoCopy(
+                kCFAllocatorDefault, &scratchUniChar, 1, 1, kCFAllocatorNull);
     }
     return s;
 }
 
+// constants -------------------------------------------------------------------
+
+const QChar QChar::null;
+
 // constructors, copy constructors, and destructors ----------------------------
 
 QChar::QChar()

-- 
WebKit Debian packaging