From 62f7b85e628d6883dcb8e36e9d17d4355f02f2c9 Mon Sep 17 00:00:00 2001 From: "mcmullen%netscape.com" Date: Tue, 22 Jun 1999 03:53:43 +0000 Subject: [PATCH] Removed two evil exported functions which I added. Well actually, I added them as inlines, but they somehow changed. So since I don't want them as exports, dust to dust, and ashes to ashes. --- xpcom/io/nsFileSpecImpl.cpp | 30 ------------------------------ xpcom/io/nsIFileSpec.idl | 4 ---- 2 files changed, 34 deletions(-) diff --git a/xpcom/io/nsFileSpecImpl.cpp b/xpcom/io/nsFileSpecImpl.cpp index c42b3fb6fec..76d301f0579 100644 --- a/xpcom/io/nsFileSpecImpl.cpp +++ b/xpcom/io/nsFileSpecImpl.cpp @@ -20,7 +20,6 @@ #include "nsIFileStream.h" #include "nsFileStream.h" -#include "nsIComponentManager.h" // For CreateInstance() #include "prmem.h" @@ -710,32 +709,3 @@ nsresult NS_NewDirectoryIterator(nsIDirectoryIterator** result) return nsDirectoryIteratorImpl::Create(nsnull, nsIDirectoryIterator::GetIID(), (void**)result); } -//---------------------------------------------------------------------------------------- -// Convinence functions for creating instances -//---------------------------------------------------------------------------------------- -nsIFileSpec* NS_CreateFileSpec() -{ - // #include nsIComponentManager.h - nsIFileSpec* spec = nsnull; - nsresult rv = nsComponentManager::CreateInstance( - (const char*)NS_FILESPEC_PROGID, - (nsISupports*)nsnull, - (const nsID&)nsIFileSpec::GetIID(), - (void**)&spec); - NS_ASSERTION(NS_SUCCEEDED(rv), "ERROR: Could not make a file spec."); - return spec; -} - -nsIDirectoryIterator* NS_CreateDirectoryIterator() -{ - // #include nsIComponentManager.h - nsIDirectoryIterator* iter = nsnull; - nsresult rv = nsComponentManager::CreateInstance( - (const char*)NS_DIRECTORYITERATOR_PROGID, - (nsISupports*)nsnull, - (const nsID&)nsIDirectoryIterator::GetIID(), - (void**)&iter); - NS_ASSERTION(NS_SUCCEEDED(rv), "ERROR: Could not make a directory iterator."); - return iter; -} - diff --git a/xpcom/io/nsIFileSpec.idl b/xpcom/io/nsIFileSpec.idl index cd1c59e4aa2..1812a544a4d 100644 --- a/xpcom/io/nsIFileSpec.idl +++ b/xpcom/io/nsIFileSpec.idl @@ -139,10 +139,6 @@ NS_COM nsresult NS_NewFileSpecWithSpec(nsFileSpec aSrcFileSpec, nsIFileSpec **re NS_COM nsresult NS_NewFileSpec(nsIFileSpec** result); NS_COM nsresult NS_NewDirectoryIterator(nsIDirectoryIterator** result); -// Convinience functions for creation of xpcom objects -NS_COM nsIFileSpec* NS_CreateFileSpec(); -NS_COM nsIDirectoryIterator* NS_CreateDirectoryIterator(); - #define NS_BOOL_ACCESSOR(_method) { PRBool yes; return NS_SUCCEEDED(f->_method(&yes)) && yes; } inline PRBool Exists(nsIFileSpec* f) NS_BOOL_ACCESSOR(exists) inline PRBool Exists(nsIDirectoryIterator* f) NS_BOOL_ACCESSOR(exists)