Moving nsISimpleEnumerator interface to new idl file. 99136, r=alecf@netscape.com sr=rpotts@netscape.com

chrome/public/nsIChromeRegistry.idl

@@ -24,7 +24,7 @@
 
 #include "nsISupports.idl"
 #include "nsIURL.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 #include "nsISupportsArray.idl"
 interface nsIDocShell;
 

extensions/cookie/nsICookieManager.idl

@@ -43,7 +43,7 @@
  */
 
 #include "nsISupports.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 
 [scriptable, uuid(AAAB6710-0F2C-11d5-A53B-0010A401EB10)]
 interface nsICookieManager : nsISupports

extensions/cookie/nsIPermissionManager.idl

@@ -43,7 +43,7 @@
  */
 
 #include "nsISupports.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 
 [scriptable, uuid(4F6B5E00-0C36-11d5-A535-0010A401EB10)]
 interface nsIPermissionManager : nsISupports

extensions/webservices/public/nsIWebServiceProxy.idl

@@ -40,7 +40,7 @@
 
 #include "nsISupports.idl"
 #include "nsIWSDL.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 #include "nsIException.idl"
 
 %{ C++

extensions/xmlextras/proxy/public/nsIWebServiceProxy.idl

@@ -40,7 +40,7 @@
 
 #include "nsISupports.idl"
 #include "nsIWSDL.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 #include "nsIException.idl"
 
 %{ C++

intl/strres/public/nsIStringBundle.idl

@@ -38,6 +38,7 @@
 
 #include "nsISupports.idl"
 #include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 
 %{C++
 

mailnews/addrbook/public/nsIAbDirFactory.idl

@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 
 interface nsIAbDirectory;
 

mailnews/base/public/nsIMsgFolder.idl

@@ -43,7 +43,7 @@
 #include "nsIMsgCopyServiceListener.idl"
 #include "nsIUrlListener.idl"
 #include "nsIEnumerator.idl"
-
+#include "nsISimpleEnumerator.idl"
 %{ C++
 #include "nsIMsgDatabase.h"
 #include "nsMsgKeyArray.h"

mailnews/base/public/nsIMsgThread.idl

@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 #include "MailNewsTypes2.idl"
 
 interface nsIMsgDBHdr;

modules/libjar/nsIZip.idl

@@ -1,53 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Don Bragg <dbragg@netscape.com>
- *     Samir Gehani <sgehani@netscape.com>
- *     Mitch Stoltz <mstoltz@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "nsIEnumerator.idl"
-#include "nsIInputStream.idl"
-
-%{C++
-#include "nsIFactory.h"
-
-#define NS_ZIP_CID \
-{ /* CEB5BDB2-121D-11d3-BCFB-00805F0E1353*/  \
-    0xCEB5BDB2,                              \
-    0x121D,                                  \
-    0x11d3,                                  \
-    {0xBC, 0xFB, 0x00, 0x80, 0x5F, 0x0E, 0x13, 0x53} \
-}
-%}
-
-[uuid(CEB5BDB1-121D-11d3-BCFB-00805F0E1353)]
-interface nsIZip : nsISupports
-{
-    PRInt32 open(in string aZipFileName);
-    PRInt32 extract(in string aFilename, in string aOutname);
-    nsISimpleEnumerator find(in string aPattern);
-    nsIInputStream getInputStream(in string aFilename);
-    PRUint32 itemSize(in string aFilename);
-};
-

netwerk/base/public/nsINetModuleMgr.idl

@@ -1,95 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* The nsINetModuleMgr singleton service allows external module to register
- * themselves with the networking library to receive events they want to
- * receive.
- *
- * An external module that is interested in being notified when a particular 
- * networking level event occurs would register with this service, and 
- * implement the appropriate interface(s) that correspond to the events they
- * want to receive. These interfaces are defined by networking internal
- * components (for example, http would define a notification interface that
- * the external cookies module would implement).
- */
-
-#include "nsISupports.idl"
-#include "nsIEnumerator.idl"
-#include "nsINetNotify.idl"
-
-interface nsIEventQueue;
-
-%{ C++
-
-// {4EBDAFE0-13BA-11d3-A15A-0050041CAF44}
-#define NS_NETMODULEMGR_CID \
-{ 0x4ebdafe0, 0x13ba, 0x11d3, { 0xa1, 0x5a, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-
-// The list of available CONTRACTIDS to register for notification on.
-#define NS_NETWORK_MODULE_MANAGER_HTTP_REQUEST_CONTRACTID          "@mozilla.org/network/moduleMgr/http/request;1"
-#define NS_NETWORK_MODULE_MANAGER_HTTP_RESPONSE_CONTRACTID         "@mozilla.org/network/moduleMgr/http/response;1"
-%}
-
-[scriptable, uuid(ff9ead40-0ef2-11d3-9de6-0010a4053fd0)]
-interface nsINetModuleMgr : nsISupports {
-	
-    // Register the external module to receive notifications.
-    // 
-    // ARGUMENTS:
-    // aTopic: The internal component that the external module wants to monitor.
-    // aNotify: The external module interface methods to be called when an event is fired.
-    //
-    // RETURNS: nsresult
-	void registerModule(in string aTopic, in nsINetNotify aNotify);
-
-    // Unregister the external module. Removes the nsINetModuleMgr binding between
-    // internal component and external module.
-    //
-    // ARGUMENTS:
-    // aTopic: The internal component being monitored.
-    // aNotify: The external modules notification module.
-    //
-    // RETURNS: nsresult
-    void unregisterModule(in string aTopic, in nsINetNotify aNotify);
-
-    // Enumerates all the registered modules for the specified topic.
-    //
-    // ARGUMENTS:
-    // aTopic: the component to get all the notifiers for.
-    // aEnumerator: the array of notifiers.
-    void enumerateModules(in string aTopic, out nsISimpleEnumerator aEnumerator);
-};

netwerk/base/public/nsIPasswordManager.idl

@@ -28,7 +28,7 @@
  */
 
 #include "nsISupports.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 
 [scriptable, uuid(173562F0-2173-11d5-A54C-0010A401EB10)]
 interface nsIPasswordManager : nsISupports

rdf/base/idl/nsIRDFContainer.idl

@@ -39,7 +39,7 @@
 #include "nsIRDFDataSource.idl"
 #include "nsIRDFResource.idl"
 #include "nsIRDFNode.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 
 // A wrapper for manipulating RDF containers
 [scriptable, uuid(D4214E90-FB94-11D2-BDD8-00104BDE6048)]

rdf/base/idl/nsIRDFDataSource.idl

@@ -39,7 +39,7 @@
 #include "nsISupportsArray.idl"
 #include "nsIRDFResource.idl"
 #include "nsIRDFNode.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 #include "nsIRDFObserver.idl"
 
 %{C++

rdf/chrome/public/nsIChromeRegistry.idl

@@ -24,7 +24,7 @@
 
 #include "nsISupports.idl"
 #include "nsIURL.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 #include "nsISupportsArray.idl"
 interface nsIDocShell;
 

xpcom/ds/nsIEnumerator.idl

@@ -40,50 +40,6 @@
 %{C++
 #define NS_ENUMERATOR_FALSE 1
 %}
-
-/**
- * Used to enumerate over elements defined by its implementor.
- * Although hasMoreElements() can be called independently of getNext(),
- * getNext() must be pre-ceeded by a call to hasMoreElements(). There is
- * no way to "reset" an enumerator, once you obtain one.
- *
- * @status FROZEN
- * @version 1.0
- */
-
-[scriptable, uuid(D1899240-F9D2-11D2-BDD6-000064657374)]
-interface nsISimpleEnumerator : nsISupports {
-  /**
-   * Called to determine whether or not the enumerator has
-   * any elements that can be returned via getNext(). This method
-   * is generally used to determine whether or not to initiate or
-   * continue iteration over the enumerator, though it can be
-   * called without subsequent getNext() calls. Does not affect
-   * internal state of enumerator.
-   *
-   * @see getNext()
-   * @return PR_TRUE if there are remaining elements in the enumerator.
-   *         PR_FALSE if there are no more elements in the enumerator.
-   */                                            
-  boolean hasMoreElements();
-
-  /**
-   * Called to retrieve the next element in the enumerator. The "next"
-   * element is the first element upon the first call. Must be
-   * pre-ceeded by a call to hasMoreElements() which returns PR_TRUE.
-   * This method is generally called within a loop to iterate over
-   * the elements in the enumerator.
-   *
-   * @see hasMoreElements()
-   * @return NS_OK if the call succeeded in returning a non-null
-   *               value through the out parameter.
-   *         NS_ERROR_FAILURE if there are no more elements
-   *                          to enumerate.
-   * @return the next element in the enumeration.
-   */
-  nsISupports getNext();
-};
-
 /*
  * DO NOT USE THIS INTERFACE.  IT IS HORRIBLY BROKEN, USES NS_COMFALSE
  * AND IS BASICALLY IMPOSSIBLE TO USE CORRECTLY THROUGH PROXIES OR
@@ -126,6 +82,8 @@ interface nsIBidirectionalEnumerator : nsIEnumerator {
 };
 
 %{C++
+#include "nsISimpleEnumerator.h"
+
 extern "C" NS_COM nsresult
 NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult);
 

xpcom/ds/nsIPropertyBag.idl

@@ -25,7 +25,7 @@
 
 #include "nsISupports.idl"
 #include "nsIVariant.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 
 [scriptable, uuid(6dcf9030-a49f-11d5-910d-0010a4e73d9a)]
 interface nsIProperty : nsISupports

xpfe/appshell/public/nsIWindowMediator.idl

@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
  
 #include "nsISupports.idl"
-#include "nsIEnumerator.idl"
+#include "nsISimpleEnumerator.idl"
 
 %{C++
 #define NS_WINDOWMEDIATOR_CID \