[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 75a153096bd9b289d36440bbf49463d837b0fc26
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 31 19:18:08 2001 +0000

    More changes to get this beast to compile
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index 9e9f68d..5ea5020 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -31,19 +31,22 @@
 
 class QTextDecoder {
 public:
-    virtual QString toUnicode(const char* chars, int len) = 0;
+    virtual QString toUnicode(const char *, int) = 0;
 };
 
 class QTextCodec {
 public:
-    static QTextCodec *codecForMib(int mib);
-    static QTextCodec *codecForName(const char* hint, int accuracy=0);
+    static QTextCodec *codecForMib(int);
+    static QTextCodec *codecForName(const char *, int accuracy = 0);
+    static QTextCodec *codecForLocale();
 
+    virtual const char* name() const = 0;
     virtual int mibEnum() const = 0;
     virtual QTextDecoder *makeDecoder() const;
-    virtual QString toUnicode(const char *chars, int len) const;
-    QString toUnicode(const QByteArray&, int len) const;
-    QString toUnicode(const char *chars) const;
+    QCString fromUnicode(const QString &) const;
+    virtual QString toUnicode(const char *, int) const;
+    QString toUnicode(const QByteArray &, int) const;
+    QString toUnicode(const char *) const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
index 9e9f68d..5ea5020 100644
--- a/WebCore/kwq/qt/qtextcodec.h
+++ b/WebCore/kwq/qt/qtextcodec.h
@@ -31,19 +31,22 @@
 
 class QTextDecoder {
 public:
-    virtual QString toUnicode(const char* chars, int len) = 0;
+    virtual QString toUnicode(const char *, int) = 0;
 };
 
 class QTextCodec {
 public:
-    static QTextCodec *codecForMib(int mib);
-    static QTextCodec *codecForName(const char* hint, int accuracy=0);
+    static QTextCodec *codecForMib(int);
+    static QTextCodec *codecForName(const char *, int accuracy = 0);
+    static QTextCodec *codecForLocale();
 
+    virtual const char* name() const = 0;
     virtual int mibEnum() const = 0;
     virtual QTextDecoder *makeDecoder() const;
-    virtual QString toUnicode(const char *chars, int len) const;
-    QString toUnicode(const QByteArray&, int len) const;
-    QString toUnicode(const char *chars) const;
+    QCString fromUnicode(const QString &) const;
+    virtual QString toUnicode(const char *, int) const;
+    QString toUnicode(const QByteArray &, int) const;
+    QString toUnicode(const char *) const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qtextcodec.h b/WebCore/src/kwq/qt/qtextcodec.h
index 9e9f68d..5ea5020 100644
--- a/WebCore/src/kwq/qt/qtextcodec.h
+++ b/WebCore/src/kwq/qt/qtextcodec.h
@@ -31,19 +31,22 @@
 
 class QTextDecoder {
 public:
-    virtual QString toUnicode(const char* chars, int len) = 0;
+    virtual QString toUnicode(const char *, int) = 0;
 };
 
 class QTextCodec {
 public:
-    static QTextCodec *codecForMib(int mib);
-    static QTextCodec *codecForName(const char* hint, int accuracy=0);
+    static QTextCodec *codecForMib(int);
+    static QTextCodec *codecForName(const char *, int accuracy = 0);
+    static QTextCodec *codecForLocale();
 
+    virtual const char* name() const = 0;
     virtual int mibEnum() const = 0;
     virtual QTextDecoder *makeDecoder() const;
-    virtual QString toUnicode(const char *chars, int len) const;
-    QString toUnicode(const QByteArray&, int len) const;
-    QString toUnicode(const char *chars) const;
+    QCString fromUnicode(const QString &) const;
+    virtual QString toUnicode(const char *, int) const;
+    QString toUnicode(const QByteArray &, int) const;
+    QString toUnicode(const char *) const;
 };
 
 #endif

-- 
WebKit Debian packaging