[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 2c961d5697ee466d5e4521992e67fbc686f93980
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 5 16:36:02 2001 +0000

    Implemented truncate
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@285 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 8b0fb4e..7384268 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -1033,12 +1033,20 @@ QString &QString::replace(const QRegExp &, const QString &)
     return *this;
 }
 
-void QString::truncate(uint)
+void QString::truncate(uint newLen)
 {
     flushCache();
-    // FIXME: not yet implemented
-    NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
-            __LINE__);
+    if (s) {
+        if (newLen) {
+            CFIndex len = CFStringGetLength(s);
+            if (len && (newLen < len)) {
+                CFStringDelete(s, CFRangeMake(newLen, len - newLen));
+            }
+        } else {
+            CFRelease(s);
+            s = NULL;
+        }
+    }
 }
 
 void QString::fill(QChar, int)
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index 8b0fb4e..7384268 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -1033,12 +1033,20 @@ QString &QString::replace(const QRegExp &, const QString &)
     return *this;
 }
 
-void QString::truncate(uint)
+void QString::truncate(uint newLen)
 {
     flushCache();
-    // FIXME: not yet implemented
-    NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
-            __LINE__);
+    if (s) {
+        if (newLen) {
+            CFIndex len = CFStringGetLength(s);
+            if (len && (newLen < len)) {
+                CFStringDelete(s, CFRangeMake(newLen, len - newLen));
+            }
+        } else {
+            CFRelease(s);
+            s = NULL;
+        }
+    }
 }
 
 void QString::fill(QChar, int)

-- 
WebKit Debian packaging