Fixed use of Object, which is apparently a keyword.

rdf/base/idl/Makefile.in

@@ -22,16 +22,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 IDLSRCS = \
-	nsIRDFCursor.idl		\
-	nsIRDFArcsInCursor.idl		\
-	nsIRDFArcsOutCursor.idl		\
-	nsIRDFAssertionCursor.idl	\
-	nsIRDFDataSource.idl		\
-	nsIRDFLiteral.idl		\
-	nsIRDFNode.idl			\
-	nsIRDFObserver.idl		\
-	nsIRDFResource.idl		\
-	nsIRDFResourceCursor.idl	\
+	rdf.idl				\
+#	nsIRDFArcsInCursor.idl		\
+#	nsIRDFArcsOutCursor.idl		\
+#	nsIRDFAssertionCursor.idl	\
+#	nsIRDFCursor.idl		\
+#	nsIRDFDataSource.idl		\
+#	nsIRDFLiteral.idl		\
+#	nsIRDFNode.idl			\
+#	nsIRDFObserver.idl		\
+#	nsIRDFResoruce.idl		\
+#	nsIRDFResourceCursor.idl	\
 	$(NULL)
 
 # for testing purposes

rdf/base/idl/nsIRDFArcsInCursor.idl

@@ -2,9 +2,10 @@
 #include "nsIRDFResource.idl"
 #include "nsIRDFNode.idl"
 
-[uuid(1ED57102-9904-11d2-8EBA-00805F29F370)]
+interface nsIRDFCursor;
 
+[uuid(1ED57102-9904-11d2-8EBA-00805F29F370)]
 interface nsIRDFArcsInCursor : nsIRDFCursor {
-    readonly attribute nsIRDFNode Object;
-    readonly attribute nsIRDFResource Predicate;
+    readonly attribute nsIRDFResource Label;
+    readonly attribute nsIRDFNode     Target;
 };

rdf/base/idl/nsIRDFArcsOutCursor.idl

@@ -3,8 +3,7 @@
 #include "nsIRDFNode.idl"
 
 [uuid(1ED57101-9904-11d2-8EBA-00805F29F370)]
-
 interface nsIRDFArcsOutCursor : nsIRDFCursor {
-    readonly attribute nsIRDFResource Subject;
-    readonly attribute nsIRDFResource Predicate;
+    readonly attribute nsIRDFResource Source;
+    readonly attribute nsIRDFResource Label;
 };

rdf/base/idl/nsIRDFAssertionCursor.idl

@@ -2,14 +2,11 @@
 interface nsIRDFNode;
 interface nsIRDFResource;
 
-[
- object, uuid(1ED57100-9904-11d2-8EBA-00805F29F370)
-]
-
+[uuid(1ED57100-9904-11d2-8EBA-00805F29F370)]
 interface nsIRDFAssertionCursor : nsIRDFCursor {
-    readonly attribute nsIRDFResource Subject;
-    readonly attribute nsIRDFResource Predicate;
-    //readonly attribute nsIRDFNode Object;
-    readonly attribute boolean TruthValue;
+    readonly attribute nsIRDFResource Source;
+    readonly attribute nsIRDFResource Label;
+    readonly attribute nsIRDFNode     Target;
+    readonly attribute boolean        TruthValue;
 };
 

rdf/base/idl/nsIRDFCursor.idl

@@ -1,13 +1,12 @@
 #include "nsISupports.idl"
-#include "nsIRDFNode.idl"
-#include "nsIRDFDataSource.idl"
+interface nsIRDFDataSource;
+interface nsIRDFNode;
 
 interface nsIRDFDataSource;
 
 [uuid(1C2ABDB0-4CEF-11D2-BC16-00805F912FE7)]
-
 interface nsIRDFCursor : nsISupports {
     void Advance();
     readonly attribute nsIRDFDataSource DataSource;
-    readonly attribute nsIRDFNode Value;
+    readonly attribute nsIRDFNode       Value;
 };

rdf/base/idl/nsIRDFLiteral.idl

@@ -3,5 +3,5 @@
 [uuid(E0C493D2-9542-11d2-8EB8-00805F29F370)]
 interface nsIRDFLiteral : nsIRDFNode {
     readonly attribute wstring Value;
-    boolean EqualsLiteral(in nsIRDFLiteral literal);
+    boolean EqualsLiteral(in nsIRDFLiteral aLiteral);
 };

rdf/base/idl/nsIRDFNode.idl

@@ -1,55 +1,9 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
 #include "nsISupports.idl"
 
-[
- object, uuid(0F78DA50-8321-11d2-8EAC-00805F29F370)
-]
+[uuid(0F78DA50-8321-11d2-8EAC-00805F29F370)]
 
-/**
- *
- * Nodes are created using an instance of nsIRDFService, which
- * should be obtained from the service manager:
- *
- * nsIRDFService* service;
- * if (NS_SUCCEEDED(nsServiceManager::GetService(kCRDFServiceCID,
- *                                               kIRDFServiceIID,
- *                                               (nsISupports**) &service))) {
- *      nsIRDFNode* node;
- *      if (NS_SUCCEEDED(service->GetResource("http://foo.bar/", node))) {
- *          // do something useful here...
- *          NS_IF_RELEASE(node);
- *      }
- *      nsServiceManager::ReleaseService(kCRDFServiceCID, mgr);
- *  }
- *
- */
 interface nsIRDFNode : nsISupports {
-    /**
-     * Called by nsIRDFService after constructing a resource object to
-     * initialize it's URI.
-     */
     void Init(in string uri);
-
-    /**
-     * Determine if two nodes are identical
-     */
     boolean EqualsNode(in nsIRDFNode aNode);
 };
 

rdf/base/idl/nsIRDFObserver.idl

@@ -3,13 +3,12 @@
 #include "nsIRDFResource.idl"
 
 [uuid(3CC75360-484A-11D2-BC16-00805F912FE7)]
-
 interface nsIRDFObserver : nsISupports {
-    void OnAssert(in nsIRDFResource aSubject,
-                  in nsIRDFResource aPredicate,
-                  in nsIRDFNode     aObject);
+    void OnAssert(in nsIRDFResource aSource,
+                  in nsIRDFResource aLabel,
+                  in nsIRDFNode     aTarget);
 
-    void OnUnassert(in nsIRDFResource aSubject,
-                    in nsIRDFResource aPredicate,
-                    in nsIRDFNode     aObject);
+    void OnUnassert(in nsIRDFResource aSource,
+                    in nsIRDFResource aLabel,
+                    in nsIRDFNode     aTarget);
 };

rdf/base/idl/nsIRDFResource.idl

@@ -4,8 +4,8 @@
 
 interface nsIRDFResource : nsIRDFNode {
     readonly attribute string Value;
-    boolean EqualsResource(in nsIRDFResource resource);
-    boolean EqualsString(in string uri);
+    boolean EqualsResource(in nsIRDFResource aResource);
+    boolean EqualsString(in string aURI);
 };