[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 bef75fae32c8cc49f8e8cfc9be171958e62fb19d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 4 19:10:59 2002 +0000

    	* src/kwq/KWQString.mm: (QString::unicode), (QString::latin1),
    	(QString::convertToQCString): Remove some excessive logging that
    	was getting in the way of important log messages.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5009209..811834c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-04-04  Darin Adler  <darin at apple.com>
+
+	* src/kwq/KWQString.mm: (QString::unicode), (QString::latin1),
+	(QString::convertToQCString): Remove some excessive logging that
+	was getting in the way of important log messages.
+
 2002-04-03  Richard Williamson  <rjw at apple.com>
 
         Added support for finalURL in data source.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5009209..811834c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-04-04  Darin Adler  <darin at apple.com>
+
+	* src/kwq/KWQString.mm: (QString::unicode), (QString::latin1),
+	(QString::convertToQCString): Remove some excessive logging that
+	was getting in the way of important log messages.
+
 2002-04-03  Richard Williamson  <rjw at apple.com>
 
         Added support for finalURL in data source.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5009209..811834c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-04-04  Darin Adler  <darin at apple.com>
+
+	* src/kwq/KWQString.mm: (QString::unicode), (QString::latin1),
+	(QString::convertToQCString): Remove some excessive logging that
+	was getting in the way of important log messages.
+
 2002-04-03  Richard Williamson  <rjw at apple.com>
 
         Added support for finalURL in data source.
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index a226a7e..6f2e055 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -304,7 +304,6 @@ const QChar *QString::unicode() const
 
     if (cache == NULL || * (int *) cache != CacheUnicode) {
         flushCache();
-        KWQDEBUG("WARNING %s:%s:%d (CFStringGetCharactersPtr failed)\n", __FUNCTION__, __FILE__, __LINE__);
         cache = CFAllocatorAllocate(kCFAllocatorDefault, sizeof(int) + len * sizeof (UniChar), 0);
         * (int *) cache = CacheUnicode;
         CFStringGetCharacters(s, CFRangeMake(0, len), (UniChar *) ((int *) cache + 1));
@@ -325,11 +324,9 @@ const char *QString::latin1() const
         
     if (cache == NULL || * (int *) cache != CacheLatin1) {
         flushCache();
-        KWQDEBUG("WARNING %s:%s:%d (CFStringGetCharactersPtr failed)\n", __FUNCTION__, __FILE__, __LINE__);
         cache = CFAllocatorAllocate(kCFAllocatorDefault, sizeof(int) + len + 1, 0);
         * (int *) cache = CacheLatin1;
         if (!CFStringGetCString(s, (char *) ((int *) cache + 1), len + 1, kCFStringEncodingISOLatin1)) {
-            KWQDEBUG("WARNING %s:%s:%d (CFStringGetCString failed)\n", __FUNCTION__, __FILE__, __LINE__);
             * (char *) ((int *) cache + 1) = '\0';
         }
     }
@@ -1103,7 +1100,6 @@ QCString QString::convertToQCString(CFStringEncoding enc) const
         char *chs = CFAllocatorAllocate(kCFAllocatorDefault, len + 1, 0);
         if (chs) {
             if (!CFStringGetCString(s, chs, len + 1, enc)) {
-                KWQDEBUG("CFStringGetCString failed\n");
                 *reinterpret_cast<char *>(chs) = '\0';
             }
             QCString qcs = QCString(chs);
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index a226a7e..6f2e055 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -304,7 +304,6 @@ const QChar *QString::unicode() const
 
     if (cache == NULL || * (int *) cache != CacheUnicode) {
         flushCache();
-        KWQDEBUG("WARNING %s:%s:%d (CFStringGetCharactersPtr failed)\n", __FUNCTION__, __FILE__, __LINE__);
         cache = CFAllocatorAllocate(kCFAllocatorDefault, sizeof(int) + len * sizeof (UniChar), 0);
         * (int *) cache = CacheUnicode;
         CFStringGetCharacters(s, CFRangeMake(0, len), (UniChar *) ((int *) cache + 1));
@@ -325,11 +324,9 @@ const char *QString::latin1() const
         
     if (cache == NULL || * (int *) cache != CacheLatin1) {
         flushCache();
-        KWQDEBUG("WARNING %s:%s:%d (CFStringGetCharactersPtr failed)\n", __FUNCTION__, __FILE__, __LINE__);
         cache = CFAllocatorAllocate(kCFAllocatorDefault, sizeof(int) + len + 1, 0);
         * (int *) cache = CacheLatin1;
         if (!CFStringGetCString(s, (char *) ((int *) cache + 1), len + 1, kCFStringEncodingISOLatin1)) {
-            KWQDEBUG("WARNING %s:%s:%d (CFStringGetCString failed)\n", __FUNCTION__, __FILE__, __LINE__);
             * (char *) ((int *) cache + 1) = '\0';
         }
     }
@@ -1103,7 +1100,6 @@ QCString QString::convertToQCString(CFStringEncoding enc) const
         char *chs = CFAllocatorAllocate(kCFAllocatorDefault, len + 1, 0);
         if (chs) {
             if (!CFStringGetCString(s, chs, len + 1, enc)) {
-                KWQDEBUG("CFStringGetCString failed\n");
                 *reinterpret_cast<char *>(chs) = '\0';
             }
             QCString qcs = QCString(chs);

-- 
WebKit Debian packaging