[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 225bbd7131207c2f7181f9164c467a06d23c30b0
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 31 23:56:41 2001 +0000

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

diff --git a/WebCore/kwq/KWQKCharsets.h b/WebCore/kwq/KWQKCharsets.h
index ea088b9..d203b10 100644
--- a/WebCore/kwq/KWQKCharsets.h
+++ b/WebCore/kwq/KWQKCharsets.h
@@ -27,15 +27,18 @@
 #define KCHARSETS_H_
 
 #include <qfont.h>
+
 class QString;
 class QTextCodec;
 
 class KCharsets {
 public:
-    QTextCodec *codecForName(const QString &name, bool &ok) const;
-    void setQFont(QFont &f, QString charset) const;
+    QTextCodec *codecForName(const QString &) const;
+    QTextCodec *codecForName(const QString &, bool &) const;
+    void setQFont(QFont &, QString) const;
+    QString name(QFont::CharSet);
     QString xCharsetName(QFont::CharSet) const;
-    bool supportsScript(const QFont &f, QFont::CharSet charset);
+    bool supportsScript(const QFont &, QFont::CharSet);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQKMimeType.h b/WebCore/kwq/KWQKMimeType.h
index 71c0d94..220aa11 100644
--- a/WebCore/kwq/KWQKMimeType.h
+++ b/WebCore/kwq/KWQKMimeType.h
@@ -26,4 +26,7 @@
 #ifndef KMIMETYPE_H_
 #define KMIMETYPE_H_
 
+// FIXME: grotesque hack to get khtml/html/html_formimpl.cpp:198 to compile
+#include <kdecore/kglobal.h>
+
 #endif
diff --git a/WebCore/kwq/kdecore/kcharsets.h b/WebCore/kwq/kdecore/kcharsets.h
index ea088b9..d203b10 100644
--- a/WebCore/kwq/kdecore/kcharsets.h
+++ b/WebCore/kwq/kdecore/kcharsets.h
@@ -27,15 +27,18 @@
 #define KCHARSETS_H_
 
 #include <qfont.h>
+
 class QString;
 class QTextCodec;
 
 class KCharsets {
 public:
-    QTextCodec *codecForName(const QString &name, bool &ok) const;
-    void setQFont(QFont &f, QString charset) const;
+    QTextCodec *codecForName(const QString &) const;
+    QTextCodec *codecForName(const QString &, bool &) const;
+    void setQFont(QFont &, QString) const;
+    QString name(QFont::CharSet);
     QString xCharsetName(QFont::CharSet) const;
-    bool supportsScript(const QFont &f, QFont::CharSet charset);
+    bool supportsScript(const QFont &, QFont::CharSet);
 };
 
 #endif
diff --git a/WebCore/kwq/kio/kmimetype.h b/WebCore/kwq/kio/kmimetype.h
index 71c0d94..220aa11 100644
--- a/WebCore/kwq/kio/kmimetype.h
+++ b/WebCore/kwq/kio/kmimetype.h
@@ -26,4 +26,7 @@
 #ifndef KMIMETYPE_H_
 #define KMIMETYPE_H_
 
+// FIXME: grotesque hack to get khtml/html/html_formimpl.cpp:198 to compile
+#include <kdecore/kglobal.h>
+
 #endif
diff --git a/WebCore/src/kwq/kdecore/kcharsets.h b/WebCore/src/kwq/kdecore/kcharsets.h
index ea088b9..d203b10 100644
--- a/WebCore/src/kwq/kdecore/kcharsets.h
+++ b/WebCore/src/kwq/kdecore/kcharsets.h
@@ -27,15 +27,18 @@
 #define KCHARSETS_H_
 
 #include <qfont.h>
+
 class QString;
 class QTextCodec;
 
 class KCharsets {
 public:
-    QTextCodec *codecForName(const QString &name, bool &ok) const;
-    void setQFont(QFont &f, QString charset) const;
+    QTextCodec *codecForName(const QString &) const;
+    QTextCodec *codecForName(const QString &, bool &) const;
+    void setQFont(QFont &, QString) const;
+    QString name(QFont::CharSet);
     QString xCharsetName(QFont::CharSet) const;
-    bool supportsScript(const QFont &f, QFont::CharSet charset);
+    bool supportsScript(const QFont &, QFont::CharSet);
 };
 
 #endif
diff --git a/WebCore/src/kwq/kio/kmimetype.h b/WebCore/src/kwq/kio/kmimetype.h
index 71c0d94..220aa11 100644
--- a/WebCore/src/kwq/kio/kmimetype.h
+++ b/WebCore/src/kwq/kio/kmimetype.h
@@ -26,4 +26,7 @@
 #ifndef KMIMETYPE_H_
 #define KMIMETYPE_H_
 
+// FIXME: grotesque hack to get khtml/html/html_formimpl.cpp:198 to compile
+#include <kdecore/kglobal.h>
+
 #endif

-- 
WebKit Debian packaging