These changes make it so webclient compiles with the tip as of 20

September 2000.  It will run, but without bookmarks.

The changes consist of the following kinds of changes:

Changes to method signatures for methods implemented by webclient.

Changes to string functions.

Changes to account for the demise of PROGIDS in favor of ContractIDs

Modified files:

M classes_spec/org/mozilla/webclient/test/EMWindow.java
M src_moz/CBrowserContainer.cpp
M src_moz/CurrentPageImpl.cpp
M src_moz/Makefile.win
M src_moz/NativeEventThread.cpp
M src_moz/RDFEnumeration.cpp
M src_moz/RDFTreeNode.cpp
M src_moz/ns_util_export.cpp
M src_moz/rdf_util.cpp


git-svn-id: svn://10.0.0.236/trunk@79658 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/webclient/src_moz/RDFEnumeration.cpp

@@ -31,6 +31,10 @@
 
 #include "prlog.h" // for PR_ASSERT
 
+#include "nsRDFCID.h" // for NS_RDFCONTAINER_CID
+
+static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID);
+
 //
 // Local function prototypes
 //
@@ -199,10 +203,10 @@ jint getNativeEnumFromJava(JNIEnv *env, jobject obj, jint nativeRDFNode)
     PR_ASSERT(gComponentManager);
     
     // get a container in order to get the enum
-    rv = gComponentManager->CreateInstanceByProgID(NS_RDFCONTAINER_PROGID,
-                                                   nsnull,
-                                                   NS_GET_IID(nsIRDFContainer),
-                                                   getter_AddRefs(container));
+    rv = gComponentManager->CreateInstance(kRDFContainerCID,
+                                           nsnull,
+                                           NS_GET_IID(nsIRDFContainer),
+                                           getter_AddRefs(container));
     if (NS_FAILED(rv)) {
         if (prLogModuleInfo) {
             PR_LOG(prLogModuleInfo, 3,