[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 06c47aef8e35a2f77c4d5bc85c25a2e74be87e35
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 17 23:20:43 2001 +0000

    Fixed the codecForName breakage
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@348 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index af6817c..b5467f6 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -68,7 +68,7 @@ public:
     // static member functions -------------------------------------------------
 
     static QTextCodec *codecForMib(int);
-    static QTextCodec *codecForName(const char *);
+    static QTextCodec *codecForName(const char *, int accuracy=0);
     static QTextCodec *codecForLocale();
 
     // constructors, copy constructors, and destructors ------------------------
diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index 8b074b1..7d6e8c6 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -28,7 +28,7 @@
 #include <qtextcodec.h>
 #include <kwqdebug.h>
 
-// FIXME: do we need this one we have a REAL implementation?
+// FIXME: do we need this once we have a real implementation?
 static QTextCodec latin1TextCodec(kCFStringEncodingISOLatin1);
 
 // class QTextDecoder ==========================================================
@@ -59,21 +59,21 @@ QString QTextDecoder::toUnicode(const char *chs, int len)
 
 QTextCodec *QTextCodec::codecForMib(int)
 {
-    // FIXME: need REAL implementation here
+    // FIXME: need real implementation here
     _logPartiallyImplemented();
     return &latin1TextCodec;
 }
 
-QTextCodec *QTextCodec::codecForName(const char *)
+QTextCodec *QTextCodec::codecForName(const char *, int)
 {
-    // FIXME: need REAL implementation here
+    // FIXME: need real implementation here
     _logPartiallyImplemented();
     return &latin1TextCodec;
 }
 
 QTextCodec *QTextCodec::codecForLocale()
 {
-    // FIXME: need REAL implementation here
+    // FIXME: need real implementation here
     _logPartiallyImplemented();
     return &latin1TextCodec;
 }
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
index af6817c..b5467f6 100644
--- a/WebCore/kwq/qt/qtextcodec.h
+++ b/WebCore/kwq/qt/qtextcodec.h
@@ -68,7 +68,7 @@ public:
     // static member functions -------------------------------------------------
 
     static QTextCodec *codecForMib(int);
-    static QTextCodec *codecForName(const char *);
+    static QTextCodec *codecForName(const char *, int accuracy=0);
     static QTextCodec *codecForLocale();
 
     // constructors, copy constructors, and destructors ------------------------
diff --git a/WebCore/src/kwq/KWQtextcodec.mm b/WebCore/src/kwq/KWQtextcodec.mm
index 8b074b1..7d6e8c6 100644
--- a/WebCore/src/kwq/KWQtextcodec.mm
+++ b/WebCore/src/kwq/KWQtextcodec.mm
@@ -28,7 +28,7 @@
 #include <qtextcodec.h>
 #include <kwqdebug.h>
 
-// FIXME: do we need this one we have a REAL implementation?
+// FIXME: do we need this once we have a real implementation?
 static QTextCodec latin1TextCodec(kCFStringEncodingISOLatin1);
 
 // class QTextDecoder ==========================================================
@@ -59,21 +59,21 @@ QString QTextDecoder::toUnicode(const char *chs, int len)
 
 QTextCodec *QTextCodec::codecForMib(int)
 {
-    // FIXME: need REAL implementation here
+    // FIXME: need real implementation here
     _logPartiallyImplemented();
     return &latin1TextCodec;
 }
 
-QTextCodec *QTextCodec::codecForName(const char *)
+QTextCodec *QTextCodec::codecForName(const char *, int)
 {
-    // FIXME: need REAL implementation here
+    // FIXME: need real implementation here
     _logPartiallyImplemented();
     return &latin1TextCodec;
 }
 
 QTextCodec *QTextCodec::codecForLocale()
 {
-    // FIXME: need REAL implementation here
+    // FIXME: need real implementation here
     _logPartiallyImplemented();
     return &latin1TextCodec;
 }
diff --git a/WebCore/src/kwq/qt/qtextcodec.h b/WebCore/src/kwq/qt/qtextcodec.h
index af6817c..b5467f6 100644
--- a/WebCore/src/kwq/qt/qtextcodec.h
+++ b/WebCore/src/kwq/qt/qtextcodec.h
@@ -68,7 +68,7 @@ public:
     // static member functions -------------------------------------------------
 
     static QTextCodec *codecForMib(int);
-    static QTextCodec *codecForName(const char *);
+    static QTextCodec *codecForName(const char *, int accuracy=0);
     static QTextCodec *codecForLocale();
 
     // constructors, copy constructors, and destructors ------------------------

-- 
WebKit Debian packaging