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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 21da992e070e9375d8110d086fa9da2b45ffea19
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 1 03:57:01 2002 +0000

    	* khtml/khtmlview.h: Add KWQKHTMLPartImpl as friend class, remove khtml_part.h
    	include that we added inside APPLE_CHANGES.
    
    	* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::end): Reinstate a line of code that
    	required friend status.
    
    	* kwq/KWQView.mm: Add include of khtml_part.h.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1250 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d1275e6..c8805fd 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-05-31  Darin Adler  <darin at apple.com>
 
+	* khtml/khtmlview.h: Add KWQKHTMLPartImpl as friend class, remove khtml_part.h
+	include that we added inside APPLE_CHANGES.
+
+	* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::end): Reinstate a line of code that
+	required friend status.
+
+	* kwq/KWQView.mm: Add include of khtml_part.h.
+
+2002-05-31  Darin Adler  <darin at apple.com>
+
 	* kwq/kwqdebug.h: Don't use displayableString; it's an SPI and those
 	are no nos inside WebCore.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d1275e6..c8805fd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-05-31  Darin Adler  <darin at apple.com>
 
+	* khtml/khtmlview.h: Add KWQKHTMLPartImpl as friend class, remove khtml_part.h
+	include that we added inside APPLE_CHANGES.
+
+	* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::end): Reinstate a line of code that
+	required friend status.
+
+	* kwq/KWQView.mm: Add include of khtml_part.h.
+
+2002-05-31  Darin Adler  <darin at apple.com>
+
 	* kwq/kwqdebug.h: Don't use displayableString; it's an SPI and those
 	are no nos inside WebCore.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d1275e6..c8805fd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-05-31  Darin Adler  <darin at apple.com>
 
+	* khtml/khtmlview.h: Add KWQKHTMLPartImpl as friend class, remove khtml_part.h
+	include that we added inside APPLE_CHANGES.
+
+	* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::end): Reinstate a line of code that
+	required friend status.
+
+	* kwq/KWQView.mm: Add include of khtml_part.h.
+
+2002-05-31  Darin Adler  <darin at apple.com>
+
 	* kwq/kwqdebug.h: Don't use displayableString; it's an SPI and those
 	are no nos inside WebCore.
 
diff --git a/WebCore/khtml/khtmlview.h b/WebCore/khtml/khtmlview.h
index f62ca3c..96d6f29 100644
--- a/WebCore/khtml/khtmlview.h
+++ b/WebCore/khtml/khtmlview.h
@@ -56,9 +56,6 @@ namespace khtml {
     void applyRule(DOM::CSSProperty *prop);
 };
 
-#ifdef APPLE_CHANGES
-#include "khtml_part.h"
-#endif /* APPLE_CHANGES */
 class KHTMLPart;
 class KHTMLViewPrivate;
 
@@ -85,6 +82,9 @@ class KHTMLView : public QScrollView
     friend class khtml::RenderWidget;
     friend class khtml::CSSStyleSelector;
     friend void khtml::applyRule(DOM::CSSProperty *prop);
+#ifdef APPLE_CHANGES
+    friend class KWQKHTMLPartImpl;
+#endif
 
 public:
     /**
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index ae60823..a9db6e1 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -361,9 +361,7 @@ void KWQKHTMLPartImpl::end()
     d->m_doc->close();
     KURL::clearCaches();
     
-    // FIXME: If this is still needed we will have to add friend to KHTMLView,
-    // but it seems like a better thing to do is to use KHTMLPart::end() instead.
-    //d->m_view->complete();
+    d->m_view->complete();
 }
  
 bool KWQKHTMLPartImpl::gotoBaseAnchor()
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index ae60823..a9db6e1 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -361,9 +361,7 @@ void KWQKHTMLPartImpl::end()
     d->m_doc->close();
     KURL::clearCaches();
     
-    // FIXME: If this is still needed we will have to add friend to KHTMLView,
-    // but it seems like a better thing to do is to use KHTMLPart::end() instead.
-    //d->m_view->complete();
+    d->m_view->complete();
 }
  
 bool KWQKHTMLPartImpl::gotoBaseAnchor()
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index db1c647..45fab79 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -27,6 +27,7 @@
 #import "kwqdebug.h"
 
 #include <khtmlview.h>
+#include <khtml_part.h>
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qevent.h>

-- 
WebKit Debian packaging