- fix build

        * loader/DocumentLoader.h: Add declarations so this compiles without ObjC.
        * loader/NetscapePlugInStreamLoader.h: Ditto.
        * loader/ResourceLoader.h: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17434 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a6589b8210e7e98fe3f1be2a13d1bbcc478ae426..678e14658ed996e7568cb6325820ba5f8cdf03a6 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-29  Darin Adler  <darin@apple.com>
+
+        - fix build
+
+        * loader/DocumentLoader.h: Add declarations so this compiles without ObjC.
+        * loader/NetscapePlugInStreamLoader.h: Ditto.
+        * loader/ResourceLoader.h: Ditto.
+
 2006-10-29  Darin Adler  <darin@apple.com>
 
         - one last name change -- WebFormState.h to FormState.h

diff --git a/WebCore/loader/DocumentLoader.h b/WebCore/loader/DocumentLoader.h
index d4d42fc624d1198497fc5b0c9f8d55b2462f0ab1..9a934994420c96cbb20699dcc5807c7e4d888adc 100644 (file)
--- a/WebCore/loader/DocumentLoader.h
+++ b/WebCore/loader/DocumentLoader.h
@@ -34,6 +34,18 @@
 
 #include "RetainPtr.h"
 
+#ifndef __OBJC__
+
+class NSData;
+class NSDictionary;
+class NSError;
+class NSMutableURLRequest;
+class NSURL;
+class NSURLRequest;
+class NSURLResponse;
+
+#endif
+
 #endif
 
 namespace WebCore {

diff --git a/WebCore/loader/NetscapePlugInStreamLoader.h b/WebCore/loader/NetscapePlugInStreamLoader.h
index 61d8b5a0a92259855cebb3312e2b2f212c869431..82c03e1bb19034e638f8b1337e8c08ea61d63409 100644 (file)
--- a/WebCore/loader/NetscapePlugInStreamLoader.h
+++ b/WebCore/loader/NetscapePlugInStreamLoader.h
@@ -27,14 +27,24 @@
  */
 
 #import "ResourceLoader.h"
-#import "WebPlugInStreamLoaderDelegate.h"
 #import <wtf/Forward.h>
 
+#ifdef __OBJC__
+#import "WebPlugInStreamLoaderDelegate.h"
+#endif
+
 namespace WebCore {
 
     class NetscapePlugInStreamLoader : public ResourceLoader {
     public:
-        static PassRefPtr<NetscapePlugInStreamLoader> create(Frame*, id <WebPlugInStreamLoaderDelegate>);
+#ifdef __OBJC__
+        typedef id <WebPlugInStreamLoaderDelegate> PlugInStreamLoaderDelegate;
+#else
+        class PlugInStreamLoaderClient;
+        typedef PlugInStreamLoaderClient* PlugInStreamLoaderDelegate;
+#endif
+
+        static PassRefPtr<NetscapePlugInStreamLoader> create(Frame*, PlugInStreamLoaderDelegate);
         virtual ~NetscapePlugInStreamLoader();
 
         bool isDone() const;
@@ -47,11 +57,11 @@ namespace WebCore {
         virtual void releaseResources();
 
     private:
-        NetscapePlugInStreamLoader(Frame*, id <WebPlugInStreamLoaderDelegate>);
+        NetscapePlugInStreamLoader(Frame*, PlugInStreamLoaderDelegate);
 
         virtual void didCancel(NSError *);
 
-        RetainPtr<id <WebPlugInStreamLoaderDelegate> > m_stream;
+        RetainPtr<PlugInStreamLoaderDelegate > m_stream;
     };
 
 }

diff --git a/WebCore/loader/ResourceLoader.h b/WebCore/loader/ResourceLoader.h
index 78500a3b965135fff9fa48e9fba1fa6ea28cee2c..6d546da26e7e255bd3f158d5b3a85bb1bf890173 100644 (file)
--- a/WebCore/loader/ResourceLoader.h
+++ b/WebCore/loader/ResourceLoader.h
@@ -44,9 +44,11 @@
 @class WebCoreResourceLoaderAsDelegate;
 #else
 class NSCachedURLResponse;
+class NSData;
 class NSError;
 class NSMutableData;
 class NSObject;
+class NSURL;
 class NSURLAuthenticationChallenge;
 class NSURLConnection;
 class NSURLCredential;