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

Fix for nsIFile delete conflicts with JS reserved name b=37406, r=dougt, sr=jst

Browse Source 
Renamed all Delete methods to Remove.

--pete


git-svn-id: svn://10.0.0.236/trunk@99803 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pete%alphanumerica.com
2001-07-24 18:38:25 +00:00
parent 796fc1aa09
commit 63991fa7da
35 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/xpcom/io/nsLocalFileUnix.cpp
View File

@@ -753,7 +753,7 @@ nsLocalFile::MoveTo(nsIFile *newParent, const char *newName)
#endif
rv = CopyTo(newParent, newName);
if (NS_SUCCEEDED(rv))
rv = Delete(PR_TRUE);
rv = Remove(PR_TRUE);
} else {
rv = NSRESULT_FOR_ERRNO();
}
@@ -762,7 +762,7 @@ nsLocalFile::MoveTo(nsIFile *newParent, const char *newName)
}
NS_IMETHODIMP
nsLocalFile::Delete(PRBool recursive)
nsLocalFile::Remove(PRBool recursive)
{
CHECK_mPath();
@@ -795,7 +795,7 @@ nsLocalFile::Delete(PRBool recursive)
nsCOMPtr<nsIFile> file = do_QueryInterface(item, &rv);
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
if (NS_FAILED(rv = file->Delete(recursive)))
if (NS_FAILED(rv = file->Remove(recursive)))
return rv;
}
}