[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 86e2ba23afc53e2176f1969097c8086d6f0d2eb9
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 19 01:38:47 2001 +0000

    Fixed stupid signed arithmetic bug in mid
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@368 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 9f6c810..cb2c8aa 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -277,7 +277,7 @@ public:
 
     QString left(uint) const;
     QString right(uint) const;
-    QString mid(int, int len=0xffffffff) const;
+    QString mid(uint, uint len=0xffffffff) const;
 
     // NOTE: copy is simple enough to keep for completeness
 //#ifdef USING_BORROWED_KURL
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 245bdf0..bef09ac 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -755,12 +755,12 @@ QString QString::right(uint width) const
     return leftRight(width, FALSE);
 }
 
-QString QString::mid(int index, int width) const
+QString QString::mid(uint index, uint width) const
 {
     QString qs;
     if (s) {
         CFIndex len = CFStringGetLength(s);
-        if (len && (index >= 0) && (index < len) && width) {
+        if (len && (index < len) && width) {
             if (!((index == 0) && (width >= len))) {
                 if (width > (len - index)) {
                     width = len - index;
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 9f6c810..cb2c8aa 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -277,7 +277,7 @@ public:
 
     QString left(uint) const;
     QString right(uint) const;
-    QString mid(int, int len=0xffffffff) const;
+    QString mid(uint, uint len=0xffffffff) const;
 
     // NOTE: copy is simple enough to keep for completeness
 //#ifdef USING_BORROWED_KURL
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index 245bdf0..bef09ac 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -755,12 +755,12 @@ QString QString::right(uint width) const
     return leftRight(width, FALSE);
 }
 
-QString QString::mid(int index, int width) const
+QString QString::mid(uint index, uint width) const
 {
     QString qs;
     if (s) {
         CFIndex len = CFStringGetLength(s);
-        if (len && (index >= 0) && (index < len) && width) {
+        if (len && (index < len) && width) {
             if (!((index == 0) && (width >= len))) {
                 if (width > (len - index)) {
                     width = len - index;
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 9f6c810..cb2c8aa 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -277,7 +277,7 @@ public:
 
     QString left(uint) const;
     QString right(uint) const;
-    QString mid(int, int len=0xffffffff) const;
+    QString mid(uint, uint len=0xffffffff) const;
 
     // NOTE: copy is simple enough to keep for completeness
 //#ifdef USING_BORROWED_KURL

-- 
WebKit Debian packaging