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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 92e4c3654a6ae5ac07022b5649da10732b85ec98
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 28 01:11:11 2002 +0000

    	* src/kwq/KWQCString.mm: (QCString::isEmpty): The || should be &&.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 04ef3e1..f5937ed 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,9 @@
 2002-03-27  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQCString.mm: (QCString::isEmpty): The || should be &&.
+
+2002-03-27  Darin Adler  <darin at apple.com>
+
 	* src/kdelibs/khtml/css/css_valueimpl.cpp:
 	(FontFamilyValueImpl::FontFamilyValueImpl): Disable misguided font matching
         code in khtml.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 04ef3e1..f5937ed 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,9 @@
 2002-03-27  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQCString.mm: (QCString::isEmpty): The || should be &&.
+
+2002-03-27  Darin Adler  <darin at apple.com>
+
 	* src/kdelibs/khtml/css/css_valueimpl.cpp:
 	(FontFamilyValueImpl::FontFamilyValueImpl): Disable misguided font matching
         code in khtml.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 04ef3e1..f5937ed 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,9 @@
 2002-03-27  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQCString.mm: (QCString::isEmpty): The || should be &&.
+
+2002-03-27  Darin Adler  <darin at apple.com>
+
 	* src/kdelibs/khtml/css/css_valueimpl.cpp:
 	(FontFamilyValueImpl::FontFamilyValueImpl): Disable misguided font matching
         code in khtml.
diff --git a/WebCore/kwq/KWQCString.mm b/WebCore/kwq/KWQCString.mm
index 03d51a2..792dbd7 100644
--- a/WebCore/kwq/KWQCString.mm
+++ b/WebCore/kwq/KWQCString.mm
@@ -82,7 +82,7 @@ QCString::QCString(const QCString &s) : QByteArray(s)
 bool QCString::isEmpty() const
 {
     const char *s = data();
-    return !(s || *s);
+    return !(s && *s);
 }
 
 bool QCString::isNull() const
diff --git a/WebCore/src/kwq/KWQCString.mm b/WebCore/src/kwq/KWQCString.mm
index 03d51a2..792dbd7 100644
--- a/WebCore/src/kwq/KWQCString.mm
+++ b/WebCore/src/kwq/KWQCString.mm
@@ -82,7 +82,7 @@ QCString::QCString(const QCString &s) : QByteArray(s)
 bool QCString::isEmpty() const
 {
     const char *s = data();
-    return !(s || *s);
+    return !(s && *s);
 }
 
 bool QCString::isNull() const

-- 
WebKit Debian packaging