Updating nsIFile usage to reflect darin's file changes

This commit is contained in:
ben%netscape.com 2002-04-28 07:57:00 +00:00
Родитель 900ba63a0b
Коммит 171e0de714
12 изменённых файлов: 56 добавлений и 60 удалений

Просмотреть файл

@ -717,7 +717,7 @@ BookmarksService::AddObserver()
nsCOMPtr<nsIFile> profileDir;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDir));
profileDir->Append("bookmarks.xml");
profileDir->Append(NS_LITERAL_CSTRING("bookmarks.xml"));
nsCAutoString bookmarksFileURL;
NS_GetURLSpecFromFile(profileDir, bookmarksFileURL);
@ -760,7 +760,7 @@ BookmarksService::FlushBookmarks()
{
nsCOMPtr<nsIFile> bookmarksFile;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(bookmarksFile));
bookmarksFile->Append("bookmarks.xml");
bookmarksFile->Append(NS_LITERAL_CSTRING("bookmarks.xml"));
nsCOMPtr<nsIOutputStream> outputStream;
NS_NewLocalFileOutputStream(getter_AddRefs(outputStream), bookmarksFile);

Просмотреть файл

@ -1209,7 +1209,7 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress,
nsCAutoString saveFile("-sav");
saveFile += tmpNo;
saveFile += "tmp";
tmpFile->Append(saveFile.get());
tmpFile->Append(saveFile);
// Get the post data if we're an HTML doc.
nsCOMPtr<nsIInputStream> postData;

Просмотреть файл

@ -69,7 +69,7 @@ public:
if (!mURL)
mDocument = do_QueryInterface(aSource);
nsCAutoString dstStr = [aDestination cString];
NS_NewLocalFile(dstStr.get(), PR_FALSE, getter_AddRefs(mDestination));
NS_NewLocalFile(dstStr, PR_FALSE, getter_AddRefs(mDestination));
mContentType = aContentType;
mPostData = aPostData;
mBypassCache = aBypassCache;
@ -170,18 +170,18 @@ nsDownloadListener::BeginDownload()
// Create a local directory in the same dir as our file. It
// will hold our associated files.
filesFolder = do_CreateInstance("@mozilla.org/file/local;1");
nsXPIDLString unicodePath;
mDestination->GetUnicodePath(getter_Copies(unicodePath));
filesFolder->InitWithUnicodePath(unicodePath.get());
nsCAutoString unicodePath;
mDestination->GetPath(unicodePath);
filesFolder->InitWithPath(unicodePath);
nsXPIDLCString leafName;
filesFolder->GetLeafName(getter_Copies(leafName));
nsCAutoString nameMinusExt(leafName.get());
nsCAutoString leafName;
filesFolder->GetLeafName(leafName);
nsCAutoString nameMinusExt(leafName);
PRInt32 index = nameMinusExt.RFind(".");
if (index >= 0)
nameMinusExt.Left(nameMinusExt, index);
nameMinusExt += " Files"; // XXXdwh needs to be localizable!
filesFolder->SetLeafName(nameMinusExt.get());
filesFolder->SetLeafName(nameMinusExt);
PRBool exists = PR_FALSE;
filesFolder->Exists(&exists);
if (!exists)
@ -219,10 +219,9 @@ nsDownloadListener::InitDialog()
[mController setSourceURL: spec2.get()];
}
}
nsXPIDLString path;
mDestination->GetUnicodePath(getter_Copies(path));
nsCAutoString pathStr; pathStr.AssignWithConversion(path.get());
nsCAutoString pathStr;
mDestination->GetPath(pathStr);
[mController setDestination: pathStr.get()];

Просмотреть файл

@ -717,7 +717,7 @@ BookmarksService::AddObserver()
nsCOMPtr<nsIFile> profileDir;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDir));
profileDir->Append("bookmarks.xml");
profileDir->Append(NS_LITERAL_CSTRING("bookmarks.xml"));
nsCAutoString bookmarksFileURL;
NS_GetURLSpecFromFile(profileDir, bookmarksFileURL);
@ -760,7 +760,7 @@ BookmarksService::FlushBookmarks()
{
nsCOMPtr<nsIFile> bookmarksFile;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(bookmarksFile));
bookmarksFile->Append("bookmarks.xml");
bookmarksFile->Append(NS_LITERAL_CSTRING("bookmarks.xml"));
nsCOMPtr<nsIOutputStream> outputStream;
NS_NewLocalFileOutputStream(getter_AddRefs(outputStream), bookmarksFile);

Просмотреть файл

@ -69,7 +69,7 @@ public:
if (!mURL)
mDocument = do_QueryInterface(aSource);
nsCAutoString dstStr = [aDestination cString];
NS_NewLocalFile(dstStr.get(), PR_FALSE, getter_AddRefs(mDestination));
NS_NewLocalFile(dstStr, PR_FALSE, getter_AddRefs(mDestination));
mContentType = aContentType;
mPostData = aPostData;
mBypassCache = aBypassCache;
@ -170,18 +170,18 @@ nsDownloadListener::BeginDownload()
// Create a local directory in the same dir as our file. It
// will hold our associated files.
filesFolder = do_CreateInstance("@mozilla.org/file/local;1");
nsXPIDLString unicodePath;
mDestination->GetUnicodePath(getter_Copies(unicodePath));
filesFolder->InitWithUnicodePath(unicodePath.get());
nsCAutoString unicodePath;
mDestination->GetPath(unicodePath);
filesFolder->InitWithPath(unicodePath);
nsXPIDLCString leafName;
filesFolder->GetLeafName(getter_Copies(leafName));
nsCAutoString nameMinusExt(leafName.get());
nsCAutoString leafName;
filesFolder->GetLeafName(leafName);
nsCAutoString nameMinusExt(leafName);
PRInt32 index = nameMinusExt.RFind(".");
if (index >= 0)
nameMinusExt.Left(nameMinusExt, index);
nameMinusExt += " Files"; // XXXdwh needs to be localizable!
filesFolder->SetLeafName(nameMinusExt.get());
filesFolder->SetLeafName(nameMinusExt);
PRBool exists = PR_FALSE;
filesFolder->Exists(&exists);
if (!exists)
@ -219,10 +219,9 @@ nsDownloadListener::InitDialog()
[mController setSourceURL: spec2.get()];
}
}
nsXPIDLString path;
mDestination->GetUnicodePath(getter_Copies(path));
nsCAutoString pathStr; pathStr.AssignWithConversion(path.get());
nsCAutoString pathStr;
mDestination->GetPath(pathStr);
[mController setDestination: pathStr.get()];

Просмотреть файл

@ -1209,7 +1209,7 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress,
nsCAutoString saveFile("-sav");
saveFile += tmpNo;
saveFile += "tmp";
tmpFile->Append(saveFile.get());
tmpFile->Append(saveFile);
// Get the post data if we're an HTML doc.
nsCOMPtr<nsIInputStream> postData;

Просмотреть файл

@ -717,7 +717,7 @@ BookmarksService::AddObserver()
nsCOMPtr<nsIFile> profileDir;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDir));
profileDir->Append("bookmarks.xml");
profileDir->Append(NS_LITERAL_CSTRING("bookmarks.xml"));
nsCAutoString bookmarksFileURL;
NS_GetURLSpecFromFile(profileDir, bookmarksFileURL);
@ -760,7 +760,7 @@ BookmarksService::FlushBookmarks()
{
nsCOMPtr<nsIFile> bookmarksFile;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(bookmarksFile));
bookmarksFile->Append("bookmarks.xml");
bookmarksFile->Append(NS_LITERAL_CSTRING("bookmarks.xml"));
nsCOMPtr<nsIOutputStream> outputStream;
NS_NewLocalFileOutputStream(getter_AddRefs(outputStream), bookmarksFile);

Просмотреть файл

@ -1209,7 +1209,7 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress,
nsCAutoString saveFile("-sav");
saveFile += tmpNo;
saveFile += "tmp";
tmpFile->Append(saveFile.get());
tmpFile->Append(saveFile);
// Get the post data if we're an HTML doc.
nsCOMPtr<nsIInputStream> postData;

Просмотреть файл

@ -69,7 +69,7 @@ public:
if (!mURL)
mDocument = do_QueryInterface(aSource);
nsCAutoString dstStr = [aDestination cString];
NS_NewLocalFile(dstStr.get(), PR_FALSE, getter_AddRefs(mDestination));
NS_NewLocalFile(dstStr, PR_FALSE, getter_AddRefs(mDestination));
mContentType = aContentType;
mPostData = aPostData;
mBypassCache = aBypassCache;
@ -170,18 +170,18 @@ nsDownloadListener::BeginDownload()
// Create a local directory in the same dir as our file. It
// will hold our associated files.
filesFolder = do_CreateInstance("@mozilla.org/file/local;1");
nsXPIDLString unicodePath;
mDestination->GetUnicodePath(getter_Copies(unicodePath));
filesFolder->InitWithUnicodePath(unicodePath.get());
nsCAutoString unicodePath;
mDestination->GetPath(unicodePath);
filesFolder->InitWithPath(unicodePath);
nsXPIDLCString leafName;
filesFolder->GetLeafName(getter_Copies(leafName));
nsCAutoString nameMinusExt(leafName.get());
nsCAutoString leafName;
filesFolder->GetLeafName(leafName);
nsCAutoString nameMinusExt(leafName);
PRInt32 index = nameMinusExt.RFind(".");
if (index >= 0)
nameMinusExt.Left(nameMinusExt, index);
nameMinusExt += " Files"; // XXXdwh needs to be localizable!
filesFolder->SetLeafName(nameMinusExt.get());
filesFolder->SetLeafName(nameMinusExt);
PRBool exists = PR_FALSE;
filesFolder->Exists(&exists);
if (!exists)
@ -219,10 +219,9 @@ nsDownloadListener::InitDialog()
[mController setSourceURL: spec2.get()];
}
}
nsXPIDLString path;
mDestination->GetUnicodePath(getter_Copies(path));
nsCAutoString pathStr; pathStr.AssignWithConversion(path.get());
nsCAutoString pathStr;
mDestination->GetPath(pathStr);
[mController setDestination: pathStr.get()];

Просмотреть файл

@ -717,7 +717,7 @@ BookmarksService::AddObserver()
nsCOMPtr<nsIFile> profileDir;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDir));
profileDir->Append("bookmarks.xml");
profileDir->Append(NS_LITERAL_CSTRING("bookmarks.xml"));
nsCAutoString bookmarksFileURL;
NS_GetURLSpecFromFile(profileDir, bookmarksFileURL);
@ -760,7 +760,7 @@ BookmarksService::FlushBookmarks()
{
nsCOMPtr<nsIFile> bookmarksFile;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(bookmarksFile));
bookmarksFile->Append("bookmarks.xml");
bookmarksFile->Append(NS_LITERAL_CSTRING("bookmarks.xml"));
nsCOMPtr<nsIOutputStream> outputStream;
NS_NewLocalFileOutputStream(getter_AddRefs(outputStream), bookmarksFile);

Просмотреть файл

@ -69,7 +69,7 @@ public:
if (!mURL)
mDocument = do_QueryInterface(aSource);
nsCAutoString dstStr = [aDestination cString];
NS_NewLocalFile(dstStr.get(), PR_FALSE, getter_AddRefs(mDestination));
NS_NewLocalFile(dstStr, PR_FALSE, getter_AddRefs(mDestination));
mContentType = aContentType;
mPostData = aPostData;
mBypassCache = aBypassCache;
@ -170,18 +170,18 @@ nsDownloadListener::BeginDownload()
// Create a local directory in the same dir as our file. It
// will hold our associated files.
filesFolder = do_CreateInstance("@mozilla.org/file/local;1");
nsXPIDLString unicodePath;
mDestination->GetUnicodePath(getter_Copies(unicodePath));
filesFolder->InitWithUnicodePath(unicodePath.get());
nsCAutoString unicodePath;
mDestination->GetPath(unicodePath);
filesFolder->InitWithPath(unicodePath);
nsXPIDLCString leafName;
filesFolder->GetLeafName(getter_Copies(leafName));
nsCAutoString nameMinusExt(leafName.get());
nsCAutoString leafName;
filesFolder->GetLeafName(leafName);
nsCAutoString nameMinusExt(leafName);
PRInt32 index = nameMinusExt.RFind(".");
if (index >= 0)
nameMinusExt.Left(nameMinusExt, index);
nameMinusExt += " Files"; // XXXdwh needs to be localizable!
filesFolder->SetLeafName(nameMinusExt.get());
filesFolder->SetLeafName(nameMinusExt);
PRBool exists = PR_FALSE;
filesFolder->Exists(&exists);
if (!exists)
@ -219,10 +219,9 @@ nsDownloadListener::InitDialog()
[mController setSourceURL: spec2.get()];
}
}
nsXPIDLString path;
mDestination->GetUnicodePath(getter_Copies(path));
nsCAutoString pathStr; pathStr.AssignWithConversion(path.get());
nsCAutoString pathStr;
mDestination->GetPath(pathStr);
[mController setDestination: pathStr.get()];

Просмотреть файл

@ -1209,7 +1209,7 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress,
nsCAutoString saveFile("-sav");
saveFile += tmpNo;
saveFile += "tmp";
tmpFile->Append(saveFile.get());
tmpFile->Append(saveFile);
// Get the post data if we're an HTML doc.
nsCOMPtr<nsIInputStream> postData;