[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 704c7f933ed19469860d39af827c45d958b54033
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 30 17:48:43 2001 +0000

    More changes for compilation
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQKPartsHistoryProvider.h b/WebCore/kwq/KWQKPartsHistoryProvider.h
index 55a64fb..755ef56 100644
--- a/WebCore/kwq/KWQKPartsHistoryProvider.h
+++ b/WebCore/kwq/KWQKPartsHistoryProvider.h
@@ -26,17 +26,16 @@
 #ifndef HISTORYPROVIDER_H_
 #define HISTORYPROVIDER_H_
 
-#include "part.h"
-
-class QString;
+// FIXME: do we still need "part.h"?
+//#include "part.h"
+#include <qobject.h>
 
 // added to help in compilation of khtml/khtml_factory.h:34
 namespace KParts {
 
-class HistoryProvider {
+class HistoryProvider : public QObject {
 public:
-    static HistoryProvider * self();
-    
+    static HistoryProvider *self();
     bool contains(const QString &) const;
 };
 
diff --git a/WebCore/kwq/KWQMap.h b/WebCore/kwq/KWQMap.h
index 103fcbf..18ccd0b 100644
--- a/WebCore/kwq/KWQMap.h
+++ b/WebCore/kwq/KWQMap.h
@@ -29,10 +29,19 @@
 template<class K, class T> class QMapIterator {
 };
 
+template<class K, class T> class QMapConstIterator {
+public:
+    bool operator!=(const QMapConstIterator <K, T> &) const;
+    const T &operator*() const;
+};
+
 template <class K, class T> class QMap {
 public:
-    typedef QMapIterator<K,T> Iterator;
+    typedef QMapIterator<K, T> Iterator;
+    typedef QMapConstIterator< K, T> ConstIterator;
+    ConstIterator end() const;
     Iterator insert(const K&, const T&);
+    ConstIterator find (const K &) const;
     void remove(const K&);
     void clear();
     T& operator[](const K& k);
diff --git a/WebCore/kwq/kparts/historyprovider.h b/WebCore/kwq/kparts/historyprovider.h
index 55a64fb..755ef56 100644
--- a/WebCore/kwq/kparts/historyprovider.h
+++ b/WebCore/kwq/kparts/historyprovider.h
@@ -26,17 +26,16 @@
 #ifndef HISTORYPROVIDER_H_
 #define HISTORYPROVIDER_H_
 
-#include "part.h"
-
-class QString;
+// FIXME: do we still need "part.h"?
+//#include "part.h"
+#include <qobject.h>
 
 // added to help in compilation of khtml/khtml_factory.h:34
 namespace KParts {
 
-class HistoryProvider {
+class HistoryProvider : public QObject {
 public:
-    static HistoryProvider * self();
-    
+    static HistoryProvider *self();
     bool contains(const QString &) const;
 };
 
diff --git a/WebCore/kwq/qt/qmap.h b/WebCore/kwq/qt/qmap.h
index 103fcbf..18ccd0b 100644
--- a/WebCore/kwq/qt/qmap.h
+++ b/WebCore/kwq/qt/qmap.h
@@ -29,10 +29,19 @@
 template<class K, class T> class QMapIterator {
 };
 
+template<class K, class T> class QMapConstIterator {
+public:
+    bool operator!=(const QMapConstIterator <K, T> &) const;
+    const T &operator*() const;
+};
+
 template <class K, class T> class QMap {
 public:
-    typedef QMapIterator<K,T> Iterator;
+    typedef QMapIterator<K, T> Iterator;
+    typedef QMapConstIterator< K, T> ConstIterator;
+    ConstIterator end() const;
     Iterator insert(const K&, const T&);
+    ConstIterator find (const K &) const;
     void remove(const K&);
     void clear();
     T& operator[](const K& k);
diff --git a/WebCore/src/kwq/kparts/historyprovider.h b/WebCore/src/kwq/kparts/historyprovider.h
index 55a64fb..755ef56 100644
--- a/WebCore/src/kwq/kparts/historyprovider.h
+++ b/WebCore/src/kwq/kparts/historyprovider.h
@@ -26,17 +26,16 @@
 #ifndef HISTORYPROVIDER_H_
 #define HISTORYPROVIDER_H_
 
-#include "part.h"
-
-class QString;
+// FIXME: do we still need "part.h"?
+//#include "part.h"
+#include <qobject.h>
 
 // added to help in compilation of khtml/khtml_factory.h:34
 namespace KParts {
 
-class HistoryProvider {
+class HistoryProvider : public QObject {
 public:
-    static HistoryProvider * self();
-    
+    static HistoryProvider *self();
     bool contains(const QString &) const;
 };
 
diff --git a/WebCore/src/kwq/qt/qmap.h b/WebCore/src/kwq/qt/qmap.h
index 103fcbf..18ccd0b 100644
--- a/WebCore/src/kwq/qt/qmap.h
+++ b/WebCore/src/kwq/qt/qmap.h
@@ -29,10 +29,19 @@
 template<class K, class T> class QMapIterator {
 };
 
+template<class K, class T> class QMapConstIterator {
+public:
+    bool operator!=(const QMapConstIterator <K, T> &) const;
+    const T &operator*() const;
+};
+
 template <class K, class T> class QMap {
 public:
-    typedef QMapIterator<K,T> Iterator;
+    typedef QMapIterator<K, T> Iterator;
+    typedef QMapConstIterator< K, T> ConstIterator;
+    ConstIterator end() const;
     Iterator insert(const K&, const T&);
+    ConstIterator find (const K &) const;
     void remove(const K&);
     void clear();
     T& operator[](const K& k);

-- 
WebKit Debian packaging