wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 485958 - remove nsISupportsArray from widget; r+sr=roc

Browse Source
This commit is contained in:
Arpad Borsos 2009-03-30 20:08:06 +02:00
parent 460de5285f
commit 4be856d77c
13 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
widget/src/beos/nsFilePicker.cpp
View File

@ -179,7 +179,7 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
BList *list = ppanel->OpenRefs();
uint32 numfiles = list->CountItems();
if ((list) && numfiles >= 1) {
nsresult rv = NS_NewISupportsArray(getter_AddRefs(mFiles));
nsresult rv;
for (uint32 i = 0; i< numfiles; i++) {
BPath *path = (BPath *)list->ItemAt(i);
@ -192,7 +192,7 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
NS_ENSURE_SUCCESS(rv,rv);
rv = file->InitWithNativePath(nsDependentCString(path->Path()));
NS_ENSURE_SUCCESS(rv,rv);
rv = mFiles->AppendElement(file);
rv = mFiles.AppendObject(file);
NS_ENSURE_SUCCESS(rv,rv);
} else {
if (i == 0) mFile.Assign(path->Path());

4
widget/src/beos/nsFilePicker.h
View File

@ -56,7 +56,7 @@
#include "nsIFileChannel.h"
#include "nsILocalFile.h"
#include "nsISimpleEnumerator.h"
#include "nsISupportsArray.h"
#include "nsCOMArray.h"
//
// Native BeOS FileSelector wrapper
@ -104,7 +104,7 @@ protected:
nsIUnicodeEncoder* mUnicodeEncoder;
nsIUnicodeDecoder* mUnicodeDecoder;
PRInt16 mSelectedType;
nsCOMPtr <nsISupportsArray> mFiles;
nsCOMArray<nsILocalFile> mFiles;
#ifdef FILEPICKER_SAVE_LAST_DIR
static char mLastUsedDirectory[];

1
widget/src/os2/nsDeviceContextSpecOS2.cpp
View File

@ -42,7 +42,6 @@
#include "nsDeviceContextSpecOS2.h"
#include "nsReadableUtils.h"
#include "nsISupportsArray.h"
#include "nsTArray.h"
#include "nsIPrefService.h"

7
widget/src/os2/nsFilePicker.cpp
View File

@ -288,8 +288,7 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
if (filedlg.lReturn == DID_OK) {
result = PR_TRUE;
if (mMode == modeOpenMultiple) {
nsresult rv = NS_NewISupportsArray(getter_AddRefs(mFiles));
NS_ENSURE_SUCCESS(rv,rv);
nsresult rv;
if (filedlg.papszFQFilename) {
for (ULONG i=0;i<filedlg.ulFQFCount;i++) {
@ -299,7 +298,7 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
rv = file->InitWithNativePath(nsDependentCString(*(filedlg.papszFQFilename)[i]));
NS_ENSURE_SUCCESS(rv,rv);
rv = mFiles->AppendElement(file);
rv = mFiles.AppendObject(file);
NS_ENSURE_SUCCESS(rv,rv);
}
WinFreeFileDlgList(filedlg.papszFQFilename);
@ -310,7 +309,7 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
rv = file->InitWithNativePath(nsDependentCString(filedlg.szFullFile));
NS_ENSURE_SUCCESS(rv,rv);
rv = mFiles->AppendElement(file);
rv = mFiles.AppendObject(file);
NS_ENSURE_SUCCESS(rv,rv);
}
} else {

4
widget/src/os2/nsFilePicker.h
View File

@ -41,7 +41,7 @@
#define nsFilePicker_h__
#include "nsISimpleEnumerator.h"
#include "nsISupportsArray.h"
#include "nsCOMArray.h"
#include "nsTArray.h"
#include "nsICharsetConverterManager.h"
@ -98,7 +98,7 @@ protected:
nsIUnicodeEncoder* mUnicodeEncoder;
nsIUnicodeDecoder* mUnicodeDecoder;
PRInt16 mSelectedType;
nsCOMPtr <nsISupportsArray> mFiles;
nsCOMArray<nsILocalFile> mFiles;
static char mLastUsedDirectory[];
};

1
widget/src/os2/nsWindow.cpp
View File

@ -52,7 +52,6 @@
#include "nsTransform2D.h"
#include "nsGfxCIID.h"
#include "prtime.h"
#include "nsISupportsArray.h"
#include "nsHashtable.h"
#include "nsDragService.h"
#include "nsILocalFile.h"

5
widget/src/photon/nsFilePicker.cpp
View File

@ -207,8 +207,7 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *aReturnVal)
else { /* here mMode is modeOpenMultiple */
PtFileSelectorInfo_t *minfo = info.minfo;
if( minfo ) {
nsresult rv = NS_NewISupportsArray(getter_AddRefs(mFiles));
NS_ENSURE_SUCCESS(rv,rv);
nsresult rv;
for( int i=0; i<minfo->nitems; i++ ) {
nsCOMPtr<nsILocalFile> file = do_CreateInstance("@mozilla.org/file/local;1", &rv);
@ -218,7 +217,7 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *aReturnVal)
rv = file->InitWithNativePath( s );
NS_ENSURE_SUCCESS(rv,rv);
rv = mFiles->AppendElement(file);
rv = mFiles.AppendObject(file);
NS_ENSURE_SUCCESS(rv,rv);
}

3
widget/src/photon/nsFilePicker.h
View File

@ -45,6 +45,7 @@
#include "nsString.h"
#include "nsIFileChannel.h"
#include "nsILocalFile.h"
#include "nsCOMArray.h"
#include <Pt.h>
@ -91,7 +92,7 @@ protected:
nsIUnicodeEncoder* mUnicodeEncoder;
nsIUnicodeDecoder* mUnicodeDecoder;
PRInt16 mSelectedType;
nsCOMPtr <nsISupportsArray> mFiles;
nsCOMArray<nsILocalFile> mFiles;
static char mLastUsedDirectory[];
};

4
widget/src/qt/nsFilePicker.h
View File

@ -44,11 +44,11 @@
#include "nsString.h"
#include "nsIURI.h"
#include "nsTArray.h"
#include "nsCOMArray.h"
#include <qfiledialog.h>
class nsIWidget;
class nsILocalFile;
class nsISupportsArray;
class QFileDialog;
class nsFilePicker : public nsBaseFilePicker
@ -79,7 +79,7 @@ private:
protected:
QFileDialog *mDialog;
nsCOMPtr<nsISupportsArray> mFiles;
nsCOMArray<nsILocalFile> mFiles;
PRInt16 mMode;
PRInt16 mSelectedType;

7
widget/src/windows/nsFilePicker.cpp
View File

@ -297,8 +297,6 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
// Set user-selected location of file or directory
if (mMode == modeOpenMultiple) {
nsresult rv = NS_NewISupportsArray(getter_AddRefs(mFiles));
NS_ENSURE_SUCCESS(rv,rv);
// from msdn.microsoft.com, "Open and Save As Dialog Boxes" section:
// If you specify OFN_EXPLORER,
@ -314,6 +312,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
if (current[dirName.Length() - 1] != '\\')
dirName.Append((PRUnichar)'\\');
nsresult rv;
while (current && *current && *(current + nsCRT::strlen(current) + 1)) {
current = current + nsCRT::strlen(current) + 1;
@ -323,7 +322,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
rv = file->InitWithPath(dirName + nsDependentString(current));
NS_ENSURE_SUCCESS(rv,rv);
rv = mFiles->AppendElement(file);
rv = mFiles.AppendObject(file);
NS_ENSURE_SUCCESS(rv,rv);
}
@ -339,7 +338,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
rv = file->InitWithPath(nsDependentString(current));
NS_ENSURE_SUCCESS(rv,rv);
rv = mFiles->AppendElement(file);
rv = mFiles.AppendObject(file);
NS_ENSURE_SUCCESS(rv,rv);
}
}

4
widget/src/windows/nsFilePicker.h
View File

@ -43,7 +43,7 @@
#include "nsILocalFile.h"
#include "nsISimpleEnumerator.h"
#include "nsISupportsArray.h"
#include "nsCOMArray.h"
#include "nsICharsetConverterManager.h"
#include "nsBaseFilePicker.h"
@ -93,7 +93,7 @@ protected:
nsString mDefaultExtension;
nsString mFilterList;
PRInt16 mSelectedType;
nsCOMPtr <nsISupportsArray> mFiles;
nsCOMArray<nsILocalFile> mFiles;
static char mLastUsedDirectory[];
nsString mUnicodeFile;
static PRUnichar *mLastUsedUnicodeDirectory;

9
widget/src/xpwidgets/nsBaseFilePicker.cpp
View File

@ -51,7 +51,7 @@
#include "nsIStringBundle.h"
#include "nsXPIDLString.h"
#include "nsIServiceManager.h"
#include "nsISupportsArray.h"
#include "nsCOMArray.h"
#include "nsILocalFile.h"
#include "nsEnumeratorUtils.h"
@ -194,9 +194,8 @@ NS_IMETHODIMP nsBaseFilePicker::SetFilterIndex(PRInt32 aFilterIndex)
NS_IMETHODIMP nsBaseFilePicker::GetFiles(nsISimpleEnumerator **aFiles)
{
NS_ENSURE_ARG_POINTER(aFiles);
nsCOMPtr <nsISupportsArray> files;
nsresult rv = NS_NewISupportsArray(getter_AddRefs(files));
NS_ENSURE_SUCCESS(rv,rv);
nsCOMArray <nsILocalFile> files;
nsresult rv;
// if we get into the base class, the platform
// doesn't implement GetFiles() yet.
@ -205,7 +204,7 @@ NS_IMETHODIMP nsBaseFilePicker::GetFiles(nsISimpleEnumerator **aFiles)
rv = GetFile(getter_AddRefs(file));
NS_ENSURE_SUCCESS(rv,rv);
rv = files->AppendElement(file);
rv = files.AppendObject(file);
NS_ENSURE_SUCCESS(rv,rv);
return NS_NewArrayEnumerator(aFiles, files);

1
widget/src/xpwidgets/nsBaseFilePicker.h
View File

@ -44,6 +44,7 @@
#include "nsIFilePicker.h"
#include "nsIWidget.h"
#include "nsISimpleEnumerator.h"
#include "nsArrayEnumerator.h"
#define BASEFILEPICKER_HAS_DISPLAYDIRECTORY 1