corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 749930 - Replace uses of nsILocalFile with nsIFile (compiled code only); r=bsmedberg

Browse Source
This commit is contained in:
Geoff Lankow
2012-06-06 14:08:30 +12:00
parent baa5aefdcf
commit 7a64448b03
290 changed files with 1141 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
widget/gtk2/nsSound.cpp
View File

@@ -69,7 +69,7 @@ static ca_proplist_sets_fn ca_proplist_sets;
static ca_context_play_full_fn ca_context_play_full;
struct ScopedCanberraFile {
ScopedCanberraFile(nsILocalFile *file): mFile(file) {};
ScopedCanberraFile(nsIFile *file): mFile(file) {};
~ScopedCanberraFile() {
if (mFile) {
@@ -80,10 +80,10 @@ struct ScopedCanberraFile {
void forget() {
mFile.forget();
}
nsILocalFile* operator->() { return mFile; }
operator nsILocalFile*() { return mFile; }
nsIFile* operator->() { return mFile; }
operator nsIFile*() { return mFile; }
nsCOMPtr<nsILocalFile> mFile;
nsCOMPtr<nsIFile> mFile;
};
static ca_context*
@@ -153,7 +153,7 @@ ca_finish_cb(ca_context *c,
int error_code,
void *userdata)
{
nsILocalFile *file = reinterpret_cast<nsILocalFile *>(userdata);
nsIFile *file = reinterpret_cast<nsIFile *>(userdata);
if (file) {
file->Remove(false);
NS_RELEASE(file);
@@ -243,8 +243,8 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
return aStatus;
}
nsCOMPtr<nsILocalFile> tmpFile;
nsDirectoryService::gService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsILocalFile),
nsCOMPtr<nsIFile> tmpFile;
nsDirectoryService::gService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsIFile),
getter_AddRefs(tmpFile));
nsresult rv = tmpFile->AppendNative(nsDependentCString("mozilla_audio_sample"));
@@ -415,8 +415,8 @@ NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
nsresult rv;
nsCOMPtr <nsIURI> fileURI;
// create a nsILocalFile and then a nsIFileURL from that
nsCOMPtr <nsILocalFile> soundFile;
// create a nsIFile and then a nsIFileURL from that
nsCOMPtr <nsIFile> soundFile;
rv = NS_NewLocalFile(aSoundAlias, true,
getter_AddRefs(soundFile));
NS_ENSURE_SUCCESS(rv,rv);