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

gramps gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:42:26 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 29408c517e473020db791aeb2f2aa95cd9b3f4ed
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 1 00:52:29 2001 +0000

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

diff --git a/WebCore/kwq/KWQKMimeType.h b/WebCore/kwq/KWQKMimeType.h
index 220aa11..406444c 100644
--- a/WebCore/kwq/KWQKMimeType.h
+++ b/WebCore/kwq/KWQKMimeType.h
@@ -29,4 +29,21 @@
 // FIXME: grotesque hack to get khtml/html/html_formimpl.cpp:198 to compile
 #include <kdecore/kglobal.h>
 
+#include <kdecore/kurl.h>
+#include <sys/types.h>
+#include <qstring.h>
+
+template<class T> class KSharedPtr
+{
+public:
+    T *operator->();
+};
+
+class KMimeType {
+public:
+    typedef KSharedPtr<KMimeType> Ptr;
+    static Ptr findByURL(const KURL &, mode_t = 0, bool = false, bool = false);
+    QString name() const;
+};
+
 #endif
diff --git a/WebCore/kwq/kio/kmimetype.h b/WebCore/kwq/kio/kmimetype.h
index 220aa11..406444c 100644
--- a/WebCore/kwq/kio/kmimetype.h
+++ b/WebCore/kwq/kio/kmimetype.h
@@ -29,4 +29,21 @@
 // FIXME: grotesque hack to get khtml/html/html_formimpl.cpp:198 to compile
 #include <kdecore/kglobal.h>
 
+#include <kdecore/kurl.h>
+#include <sys/types.h>
+#include <qstring.h>
+
+template<class T> class KSharedPtr
+{
+public:
+    T *operator->();
+};
+
+class KMimeType {
+public:
+    typedef KSharedPtr<KMimeType> Ptr;
+    static Ptr findByURL(const KURL &, mode_t = 0, bool = false, bool = false);
+    QString name() const;
+};
+
 #endif
diff --git a/WebCore/src/kwq/kio/kmimetype.h b/WebCore/src/kwq/kio/kmimetype.h
index 220aa11..406444c 100644
--- a/WebCore/src/kwq/kio/kmimetype.h
+++ b/WebCore/src/kwq/kio/kmimetype.h
@@ -29,4 +29,21 @@
 // FIXME: grotesque hack to get khtml/html/html_formimpl.cpp:198 to compile
 #include <kdecore/kglobal.h>
 
+#include <kdecore/kurl.h>
+#include <sys/types.h>
+#include <qstring.h>
+
+template<class T> class KSharedPtr
+{
+public:
+    T *operator->();
+};
+
+class KMimeType {
+public:
+    typedef KSharedPtr<KMimeType> Ptr;
+    static Ptr findByURL(const KURL &, mode_t = 0, bool = false, bool = false);
+    QString name() const;
+};
+
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list