From 88d748c99a2b0e9cdcc88feff4f7ef70f2023aeb Mon Sep 17 00:00:00 2001 From: "scc%netscape.com" Date: Mon, 24 Apr 2000 05:19:20 +0000 Subject: [PATCH] makings string conversions explicit git-svn-id: svn://10.0.0.236/trunk@66965 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp | 4 ++-- mozilla/xpfe/bootstrap/nsAppRunner.cpp | 2 +- .../xpfe/components/startup/src/nsCommandLineServiceMac.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp index 6f969fad0a9..1dd0dbd2d7f 100644 --- a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp @@ -265,7 +265,7 @@ OSErr nsMacCommandLine::HandleOpenOneDoc(const FSSpec& inFileSpec, OSType inFile // Final case: we're not just starting up. How do we handle this? nsFileSpec fileSpec(inFileSpec); nsFileURL fileURL(fileSpec); - nsString urlString(fileURL.GetURLString()); + nsString urlString; urlString.AssignWithConversion(fileURL.GetURLString()); nsresult rv; rv = OpenWindow( "chrome://navigator/content", urlString.GetUnicode() ); if (NS_FAILED(rv)) @@ -337,7 +337,7 @@ OSErr nsMacCommandLine::DispatchURLToNewBrowser(const char* url) if (mStartedUp) { nsresult rv; - rv = OpenWindow("chrome://navigator/content", nsAutoString(url).GetUnicode()); + rv = OpenWindow("chrome://navigator/content", NS_ConvertASCIItoUCS2(url).GetUnicode()); if (NS_FAILED(rv)) return errAEEventNotHandled; } diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp index d43812cb001..649e8a0643d 100644 --- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp +++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp @@ -358,7 +358,7 @@ static nsresult LaunchApplicationWithArgs(const char *commandLineArg, nsICmdLine if (NS_FAILED(rv)) return rv; if (openWindowWithArgs) { - nsString cmdArgs((const char *)cmdResult); + nsString cmdArgs; cmdArgs.AssignWithConversion(NS_STATIC_CAST(const char *, cmdResult)); #ifdef DEBUG_CMD_LINE printf("opening %s with %s\n",(const char *)chromeUrlForTask,"OpenWindow"); #endif /* DEBUG_CMD_LINE */ diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp index 6f969fad0a9..1dd0dbd2d7f 100644 --- a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp @@ -265,7 +265,7 @@ OSErr nsMacCommandLine::HandleOpenOneDoc(const FSSpec& inFileSpec, OSType inFile // Final case: we're not just starting up. How do we handle this? nsFileSpec fileSpec(inFileSpec); nsFileURL fileURL(fileSpec); - nsString urlString(fileURL.GetURLString()); + nsString urlString; urlString.AssignWithConversion(fileURL.GetURLString()); nsresult rv; rv = OpenWindow( "chrome://navigator/content", urlString.GetUnicode() ); if (NS_FAILED(rv)) @@ -337,7 +337,7 @@ OSErr nsMacCommandLine::DispatchURLToNewBrowser(const char* url) if (mStartedUp) { nsresult rv; - rv = OpenWindow("chrome://navigator/content", nsAutoString(url).GetUnicode()); + rv = OpenWindow("chrome://navigator/content", NS_ConvertASCIItoUCS2(url).GetUnicode()); if (NS_FAILED(rv)) return errAEEventNotHandled; }