Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

makings string conversions explicit

Browse Source
This commit is contained in:
scc%netscape.com 2000-04-24 05:19:20 +00:00
parent 3f0250495b
commit 4fc9172ea9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpfe/appshell/src/nsCommandLineServiceMac.cpp
View File

@ -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;
}

2
xpfe/bootstrap/nsAppRunner.cpp
View File

@ -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 */

4
xpfe/components/startup/src/nsCommandLineServiceMac.cpp
View File

@ -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;
}