Bug 567013 - remove unused nsIBaseStream interface r=khuey
authorDavid Zbarsky <dzbarsky@gmail.com>
Tue, 09 Aug 2011 12:28:00 -0400
changeset 74172 863ba598a27b169d5f26eb8887d4c2fb70fd33c4
parent 74171 1c473f70373b390eed5095ed38238af536eadc9b
child 74173 b8ea31e6eeb4b32bf61346d8edf1c5818593d571
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerskhuey
bugs567013
milestone8.0a1
Bug 567013 - remove unused nsIBaseStream interface r=khuey
rdf/tests/rdfcat/rdfcat.cpp
rdf/tests/triplescat/triplescat.cpp
xpcom/io/nsIBaseStream.idl
xpcom/io/nsScriptableInputStream.cpp
--- a/rdf/tests/rdfcat/rdfcat.cpp
+++ b/rdf/tests/rdfcat/rdfcat.cpp
@@ -92,22 +92,21 @@ class ConsoleOutputStreamImpl : public n
 {
 public:
     ConsoleOutputStreamImpl(void) {}
     virtual ~ConsoleOutputStreamImpl(void) {}
 
     // nsISupports interface
     NS_DECL_ISUPPORTS
 
-    // nsIBaseStream interface
+    // nsIOutputStream interface
     NS_IMETHOD Close(void) {
         return NS_OK;
     }
 
-    // nsIOutputStream interface
     NS_IMETHOD Write(const char* aBuf, PRUint32 aCount, PRUint32 *aWriteCount) {
         PR_Write(PR_GetSpecialFD(PR_StandardOutput), aBuf, aCount);
         *aWriteCount = aCount;
         return NS_OK;
     }
 
     NS_IMETHOD
     WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval) {
--- a/rdf/tests/triplescat/triplescat.cpp
+++ b/rdf/tests/triplescat/triplescat.cpp
@@ -90,22 +90,21 @@ class ConsoleOutputStreamImpl : public n
 {
 public:
     ConsoleOutputStreamImpl(void) {}
     virtual ~ConsoleOutputStreamImpl(void) {}
 
     // nsISupports interface
     NS_DECL_ISUPPORTS
 
-    // nsIBaseStream interface
+    // nsIOutputStream interface
     NS_IMETHOD Close(void) {
         return NS_OK;
     }
 
-    // nsIOutputStream interface
     NS_IMETHOD Write(const char* aBuf, PRUint32 aCount, PRUint32 *aWriteCount) {
         PR_Write(PR_GetSpecialFD(PR_StandardOutput), aBuf, aCount);
         *aWriteCount = aCount;
         return NS_OK;
     }
 
     NS_IMETHOD
     WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval) {
deleted file mode 100644
--- a/xpcom/io/nsIBaseStream.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 of 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 MPL, 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 MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(6ccb17a0-e95e-11d1-beae-00805f8a66dc)]
-interface nsIBaseStream : nsISupports
-{
-    /** Close the stream. */
-    void close();
-};
--- a/xpcom/io/nsScriptableInputStream.cpp
+++ b/xpcom/io/nsScriptableInputStream.cpp
@@ -36,24 +36,23 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsScriptableInputStream.h"
 #include "nsMemory.h"
 #include "nsString.h"
 
 NS_IMPL_ISUPPORTS1(nsScriptableInputStream, nsIScriptableInputStream)
 
-// nsIBaseStream methods
+// nsIScriptableInputStream methods
 NS_IMETHODIMP
 nsScriptableInputStream::Close(void) {
     if (!mInputStream) return NS_ERROR_NOT_INITIALIZED;
     return mInputStream->Close();
 }
 
-// nsIScriptableInputStream methods
 NS_IMETHODIMP
 nsScriptableInputStream::Init(nsIInputStream *aInputStream) {
     if (!aInputStream) return NS_ERROR_NULL_POINTER;
     mInputStream = aInputStream;
     return NS_OK;
 }
 
 NS_IMETHODIMP