Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated nsTString::ToCString (bug 323471). r+sr=darin.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@188104 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2006-01-24 19:22:02 +00:00
parent d7530f69ae
commit 256fd4c351
23 changed files with 71 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/webshell/tests/viewer/nsViewerApp.cpp
View File

@@ -820,8 +820,10 @@ nsEventStatus PR_CALLBACK HandleRobotEvent(nsGUIEvent *aEvent)
delete[] cStr;
mVerDirTxt->GetText(str, 255, size);
str.ToCString(gVerifyDir, (PRInt32)_MAX_PATH);
if (!strcmp(gVerifyDir,DEBUG_EMPTY)) {
nsFixedCString verifyDirStr(gVerifyDir, sizeof(gVerifyDir));
LossyCopyUTF16toASCII(str, verifyDirStr);
if (verifyDirStr.get() != gVerifyDir ||
!strcmp(gVerifyDir,DEBUG_EMPTY)) {
gVerifyDir[0] = '\0';
}
PRBool state = PR_FALSE;

15
mozilla/webshell/tests/viewer/nsWebCrawler.cpp
View File

@@ -558,10 +558,7 @@ nsWebCrawler::GetOutputFile(nsIURI *aURL, nsString& aOutputName)
nsAutoString outputFileName(mOutputDir);
outputFileName.AppendWithConversion(inputFileName);
PRInt32 bufLen = outputFileName.Length()+1;
char *buf = new char[bufLen+1];
outputFileName.ToCString(buf, bufLen);
result = fopen(buf, "wt");
delete [] buf;
result = fopen(NS_LossyConvertUTF16toASCII(outputFileName).get(), "wt");
delete [] inputFileName;
}
return result;
@@ -942,12 +939,10 @@ nsWebCrawler::PerformRegressionTest(const nsString& aOutputName)
rv = fu->CompareRegressionData(f1, f2,mRegressionOutputLevel);
NS_RELEASE(fu);
char dirName[BUF_SIZE];
char fileName[BUF_SIZE];
mOutputDir.ToCString(dirName, BUF_SIZE-1);
aOutputName.ToCString(fileName, BUF_SIZE-1);
printf("regression test %s%s %s\n", dirName, fileName, NS_SUCCEEDED(rv) ? "passed" : "failed");
printf("regression test %s%s %s\n",
NS_LossyConvertUTF16toASCII(mOutputDir).get(),
NS_LossyConvertUTF16toASCII(aOutputName).get(),
NS_SUCCEEDED(rv) ? "passed" : "failed");
}
//----------------------------------------------------------------------

5
mozilla/webshell/tests/viewer/os2/nsCheckButton.cpp
View File

@@ -158,10 +158,7 @@ NS_METHOD nsCheckButton::GetState(PRBool& aState)
//-------------------------------------------------------------------------
NS_METHOD nsCheckButton::SetLabel(const nsString& aText)
{
char label[256];
aText.ToCString(label, 256);
label[255] = '\0';
::WinSetWindowText(mWnd, label);
::WinSetWindowText(mWnd, NS_LossyConvertUTF16toASCII(aText).get());
return NS_OK;
}

5
mozilla/webshell/tests/viewer/windows/nsCheckButton.cpp
View File

@@ -155,10 +155,7 @@ NS_METHOD nsCheckButton::GetState(PRBool& aState)
//-------------------------------------------------------------------------
NS_METHOD nsCheckButton::SetLabel(const nsString& aText)
{
char label[256];
aText.ToCString(label, 256);
label[255] = '\0';
VERIFY(::SetWindowText(mWnd, label));
VERIFY(::SetWindowText(mWnd, NS_LossyConvertUTF16toASCII(aText).get()));
return NS_OK;
}