From b8ea09c9593dc81eb1f7b99bd127a6245e605330 Mon Sep 17 00:00:00 2001
From: "waterson%netscape.com" <waterson%netscape.com>
Date: Thu, 24 Dec 1998 06:56:49 +0000
Subject: [PATCH] Added nsStreamDataSource.

---
 rdf/datasource/src/Makefile.in            |  1 +
 rdf/datasource/src/makefile.win           |  1 +
 rdf/datasource/src/nsStreamDataSource.cpp | 10 +++++-----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in
index 81b37ad06064..34ee0cfea14e 100644
--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/src/Makefile.in
@@ -28,6 +28,7 @@ LIBRARY_NAME = rdfdatasource_s
 
 CPPSRCS =				\
         nsBookmarkDataSource.cpp	\
+	nsStreamDataSource.cpp		\
 	$(NULL)
 
 EXPORTS = \
diff --git a/rdf/datasource/src/makefile.win b/rdf/datasource/src/makefile.win
index 0aeb8e22efa9..4f6ef75545bd 100644
--- a/rdf/datasource/src/makefile.win
+++ b/rdf/datasource/src/makefile.win
@@ -21,6 +21,7 @@ LIBRARY_NAME=rdfdatasource_s
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsBookmarkDataSource.obj    \
+        .\$(OBJDIR)\nsStreamDataSource.obj      \
 	$(NULL)
 
 # XXX Note the dependency on $(DEPTH)\rdf\base\src: we use rdfutil.h over
diff --git a/rdf/datasource/src/nsStreamDataSource.cpp b/rdf/datasource/src/nsStreamDataSource.cpp
index 87a39f033cde..f97cb47b072c 100644
--- a/rdf/datasource/src/nsStreamDataSource.cpp
+++ b/rdf/datasource/src/nsStreamDataSource.cpp
@@ -31,7 +31,7 @@
 #include "nsIStreamListener.h"
 #include "nsIURL.h"
 #include "nsParserCIID.h"
-#include "nsRDFBaseCID.h"
+#include "nsRDFCID.h"
 
 ////////////////////////////////////////////////////////////////////////
 
@@ -41,9 +41,9 @@ static NS_DEFINE_IID(kIRDFContentSinkIID, NS_IRDFCONTENTSINK_IID);
 static NS_DEFINE_IID(kIRDFDataSourceIID,  NS_IRDFDATASOURCE_IID);
 static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
 
-static NS_DEFINE_CID(kParserCID,          NS_PARSER_IID); // XXX
-static NS_DEFINE_CID(kRDFContentSinkCID,  NS_RDFCONTENTSINK_CID);
-static NS_DEFINE_CID(kWellFormedDTDCID,   NS_WELLFORMEDDTD_CID);
+static NS_DEFINE_CID(kParserCID,                NS_PARSER_IID); // XXX
+static NS_DEFINE_CID(kRDFSimpleContentSinkCID,  NS_RDFSIMPLECONTENTSINK_CID);
+static NS_DEFINE_CID(kWellFormedDTDCID,         NS_WELLFORMEDDTD_CID);
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -169,7 +169,7 @@ StreamDataSourceImpl::Init(const char* uri)
     // XXX Get a namespace manager *here*
     PR_ASSERT(0);
 
-    if (NS_FAILED(rv = nsRepository::CreateInstance(kRDFContentSinkCID,
+    if (NS_FAILED(rv = nsRepository::CreateInstance(kRDFSimpleContentSinkCID,
                                                     nsnull,
                                                     kIRDFContentSinkIID,
                                                     (void**) &sink)))