From e896df615daf653f105aa08b21a110eb0094eff4 Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Sat, 14 Sep 2002 01:10:47 +0000 Subject: [PATCH] Fix darin build bustage. r=law git-svn-id: svn://10.0.0.236/trunk@129589 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp | 11 +++-------- .../startup/src/nsCommandLineServiceMac.cpp | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp index 39aa17be5b8..cedfacfd233 100644 --- a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp @@ -45,6 +45,7 @@ #include "nsFileSpec.h" #include "nsFileStream.h" #include "nsDebug.h" +#include "nsNetUtil.h" #include "nsIAppShellService.h" #include "nsIServiceManager.h" #include "nsIURL.h" @@ -199,11 +200,8 @@ nsresult nsMacCommandLine::AddToCommandLine(const char* inOptionString, const FS nsresult rv = NS_NewLocalFileWithFSSpec(&nonConstSpec, PR_TRUE, getter_AddRefs(inFile)); if (NS_FAILED(rv)) return rv; - nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID)); - if (!ioService) - return NS_ERROR_FAILURE; nsCAutoString specBuf; - rv = ioService->GetURLSpecFromFile(inFile, specBuf); + rv = NS_GetURLSpecFromFile(inFile, specBuf); if (NS_FAILED(rv)) return rv; mTempArgsString.Append(" "); @@ -283,11 +281,8 @@ OSErr nsMacCommandLine::HandleOpenOneDoc(const FSSpec& inFileSpec, OSType inFile rv = NS_NewLocalFileWithFSSpec(&nonConstSpec, PR_TRUE, getter_AddRefs(inFile)); if (NS_FAILED(rv)) return errAEEventNotHandled; - nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID)); - if (!ioService) - return errAEEventNotHandled; nsCAutoString specBuf; - rv = ioService->GetURLSpecFromFile(inFile, specBuf); + rv = NS_GetURLSpecFromFile(inFile, specBuf); if (NS_FAILED(rv)) return errAEEventNotHandled; nsAutoString urlString; diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp index 39aa17be5b8..cedfacfd233 100644 --- a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp @@ -45,6 +45,7 @@ #include "nsFileSpec.h" #include "nsFileStream.h" #include "nsDebug.h" +#include "nsNetUtil.h" #include "nsIAppShellService.h" #include "nsIServiceManager.h" #include "nsIURL.h" @@ -199,11 +200,8 @@ nsresult nsMacCommandLine::AddToCommandLine(const char* inOptionString, const FS nsresult rv = NS_NewLocalFileWithFSSpec(&nonConstSpec, PR_TRUE, getter_AddRefs(inFile)); if (NS_FAILED(rv)) return rv; - nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID)); - if (!ioService) - return NS_ERROR_FAILURE; nsCAutoString specBuf; - rv = ioService->GetURLSpecFromFile(inFile, specBuf); + rv = NS_GetURLSpecFromFile(inFile, specBuf); if (NS_FAILED(rv)) return rv; mTempArgsString.Append(" "); @@ -283,11 +281,8 @@ OSErr nsMacCommandLine::HandleOpenOneDoc(const FSSpec& inFileSpec, OSType inFile rv = NS_NewLocalFileWithFSSpec(&nonConstSpec, PR_TRUE, getter_AddRefs(inFile)); if (NS_FAILED(rv)) return errAEEventNotHandled; - nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID)); - if (!ioService) - return errAEEventNotHandled; nsCAutoString specBuf; - rv = ioService->GetURLSpecFromFile(inFile, specBuf); + rv = NS_GetURLSpecFromFile(inFile, specBuf); if (NS_FAILED(rv)) return errAEEventNotHandled; nsAutoString urlString;