[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 2ffb642746f1678edc217bf9e05945deb9658279
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 4 15:11:53 2001 +0000

    Fixed a few bugs from previous checkin
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@272 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index e4b52a8..85fc5f0 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -430,7 +430,7 @@ int QString::find(const QRegExp &qre, int index) const
             index += len;
         }
         if (len && (index >= 0) && (index < len)) {
-            qre.match(*this, index);
+            return qre.match(*this, index);
         }
     }
     return -1;
@@ -952,9 +952,7 @@ QChar QString::operator[](int index) const
     if (s && (index >= 0)) {
         CFIndex len = CFStringGetLength(s);
         if (index < len) {
-            CFStringInlineBuffer buf;
-            CFStringInitInlineBuffer(s, &buf, CFRangeMake(0, index));
-            return QChar(CFStringGetCharacterFromInlineBuffer(&buf, index));
+            return QChar(CFStringGetCharacterAtIndex(s, index));
         }
     }
     return QChar(0);
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index e4b52a8..85fc5f0 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -430,7 +430,7 @@ int QString::find(const QRegExp &qre, int index) const
             index += len;
         }
         if (len && (index >= 0) && (index < len)) {
-            qre.match(*this, index);
+            return qre.match(*this, index);
         }
     }
     return -1;
@@ -952,9 +952,7 @@ QChar QString::operator[](int index) const
     if (s && (index >= 0)) {
         CFIndex len = CFStringGetLength(s);
         if (index < len) {
-            CFStringInlineBuffer buf;
-            CFStringInitInlineBuffer(s, &buf, CFRangeMake(0, index));
-            return QChar(CFStringGetCharacterFromInlineBuffer(&buf, index));
+            return QChar(CFStringGetCharacterAtIndex(s, index));
         }
     }
     return QChar(0);

-- 
WebKit Debian packaging