mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Changing nsVector* to nsArray* to not conflict with XPCOM nsVector in new build 

naming scheme
This commit is contained in:
spider%netscape.com 1998-11-02 22:32:15 +00:00
Родитель 187da7572d
Коммит d109177c90
51 изменённых файлов: 168 добавлений и 168 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
calendar/modules/core/inc/nsCalNetFetchCollector.h
Просмотреть файл

@ -22,13 +22,13 @@
#include "nscalexport.h"
#include "nsCalNetFetchVals.h"
#include "nsICalNetFetchCollector.h"
#include "nsIVector.h"
#include "nsIArray.h"
class NS_CALENDAR nsCalNetFetchCollector : public nsICalNetFetchCollector
{
nsIVector * mpFetchList ;
nsIArray * mpFetchList ;
public:
nsCalNetFetchCollector(nsISupports* outer);

4
calendar/modules/core/inc/nsCalNetFetchCommand.h
Просмотреть файл

@ -22,13 +22,13 @@
#include "nscalexport.h"
#include "nsCalNetFetchVals.h"
#include "nsICalNetFetchCommand.h"
#include "nsIVector.h"
#include "nsIArray.h"
class NS_CALENDAR nsCalNetFetchCommand
{
nsIVector * mpLayerList ; // all the layers that need the events from this range
nsIArray * mpLayerList ; // all the layers that need the events from this range
public:
nsCalNetFetchCommand(nsISupports* outer);

4
calendar/modules/core/inc/nsLayerCollection.h
Просмотреть файл

@ -22,7 +22,7 @@
#include "nscalexport.h"
#include "nsILayer.h"
#include "nsILayerCollection.h"
#include "nsIVector.h"
#include "nsIArray.h"
class NS_CALENDAR nsLayerCollection : public nsILayerCollection,
@ -62,7 +62,7 @@ public:
NS_IMETHOD StoreEvent(VEvent& addEvent);
private:
nsIVector * mLayers ;
nsIArray * mLayers ;
nsCalendarShell * mpShell;
};

2
calendar/modules/core/src/nsCalNetFetchCollector.cpp
Просмотреть файл

@ -47,7 +47,7 @@ nsCalNetFetchCollector::~nsCalNetFetchCollector()
nsresult nsCalNetFetchCollector::Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID, nsnull, kCVectorCID, (void **)&mpFetchList);
if (NS_OK != res)

4
calendar/modules/core/src/nsLayerCollection.cpp
Просмотреть файл

@ -89,7 +89,7 @@ nsLayerCollection::~nsLayerCollection()
nsresult nsLayerCollection::Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
@ -306,7 +306,7 @@ nsresult nsLayerCollection::FetchEventsByRange(
{
PRLock *pLock;
PRCondVar *pSomeThreadsCompleted;
NSVector PendingThreadCompletions;
nsArray PendingThreadCompletions;
PRInt32 i;
PRInt32 iTmpSize;
PRInt32 iFinishedThreadCount = 0;

8
calendar/modules/parser/calxml/inc/nsCalXMLContentSink.h
Просмотреть файл

@ -26,7 +26,7 @@
#include "nsIHTMLContentSink.h"
#include "nsCalendarContainer.h"
#include "nsCalUtilCIID.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsIStack.h"
#include "nsIXMLParserObject.h"
@ -87,10 +87,10 @@ private:
private:
nsCalendarContainer * mCalendarContainer;
nsIVector * mTimeContextList;
nsIArray * mTimeContextList;
nsIStack * mCanvasStack;
nsIVector * mOrphanCanvasList;
nsIVector * mControlList ;
nsIArray * mOrphanCanvasList;
nsIArray * mControlList ;
};

6
calendar/modules/parser/calxml/src/nsCalXMLContentSink.cpp
Просмотреть файл

@ -93,7 +93,7 @@ nsCalXMLContentSink::nsCalXMLContentSink() : nsIHTMLContentSink()
NS_INIT_REFCNT();
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
@ -130,8 +130,8 @@ nsCalXMLContentSink::nsCalXMLContentSink() : nsIHTMLContentSink()
if (mControlList == nsnull) {
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,

6
calendar/modules/parser/ical/inc/nsCalICalendarContentSink.h
Просмотреть файл

@ -23,7 +23,7 @@
#include "nsIContentSink.h"
#include "nsString.h"
#include "nsxpfcCIID.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsIStack.h"
#include "nsCalICalendarDTD.h"
@ -66,8 +66,8 @@ public:
private:
nsIWebViewerContainer * mViewerContainer ;
nsIStack * mXPFCStack;
nsIVector * mOrphanMenuList;
nsIVector * mContainerList ;
nsIArray * mOrphanMenuList;
nsIArray * mContainerList ;
PRUint32 mState;
};

4
calendar/modules/shell/inc/nscalcids.h
Просмотреть файл

@ -42,8 +42,8 @@ static NS_DEFINE_IID(kCXPFCSubjectCID, NS_XPFC_SUBJECT_CID);
static NS_DEFINE_IID(kCXPFCObserverManagerCID, NS_XPFC_OBSERVERMANAGER_CID);
static NS_DEFINE_IID(kCXPFCCanvasManagerCID, NS_XPFC_CANVASMANAGER_CID);
static NS_DEFINE_IID(kCCalToolkitCID, NS_CAL_TOOLKIT_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCDateTimeCID, NS_DATETIME_CID);
static NS_DEFINE_IID(kCstackCID, NS_STACK_CID);
static NS_DEFINE_IID(kCDurationCID, NS_DURATION_CID);

4
calendar/modules/shell/src/nsCalendarShell.cpp
Просмотреть файл

@ -975,8 +975,8 @@ nsresult nsCalendarShell::RegisterFactories()
nsRepository::RegisterFactory(kCCalTimeContextCID, CALUI_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCCalContextControllerCID, CALUI_DLL, PR_FALSE, PR_FALSE);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
nsRepository::RegisterFactory(kCVectorCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCVectorIteratorCID, XPFC_DLL, PR_FALSE, PR_FALSE);

4
calendar/modules/test/src/nsTrexTestShell.cpp
Просмотреть файл

@ -557,8 +557,8 @@ nsresult nsTrexTestShell::RegisterFactories()
nsRepository::RegisterFactory(kCXPFCCanvasCID, XPFC_DLL, PR_FALSE, PR_FALSE);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
nsRepository::RegisterFactory(kCVectorCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCVectorIteratorCID, XPFC_DLL, PR_FALSE, PR_FALSE);

2
calendar/modules/ui/canvas/src/nsCalMultiDayViewCanvas.cpp
Просмотреть файл

@ -22,7 +22,7 @@
#include "nsBoxLayout.h"
#include "nsCalUICIID.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsCalToolkit.h"

2
calendar/modules/ui/canvas/src/nsCalMultiUserViewCanvas.cpp
Просмотреть файл

@ -21,7 +21,7 @@
#include "nsCalTimebarTimeHeading.h"
#include "nsBoxLayout.h"
#include "nsCalUICIID.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsCalToolkit.h"
#include "nsCalNewModelCommand.h"

2
calendar/modules/ui/canvas/src/nsCalMultiViewCanvas.cpp
Просмотреть файл

@ -20,7 +20,7 @@
#include "nsCalTimebarTimeHeading.h"
#include "nsBoxLayout.h"
#include "nsCalUICIID.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsCalToolkit.h"
#include "nsCalNewModelCommand.h"

6
calendar/modules/ui/command/inc/nsCalDayListCommand.h
Просмотреть файл

@ -21,7 +21,7 @@
#include "nsXPFCCommand.h"
#include "nsCalUtilCIID.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsIDateTime.h"
@ -37,13 +37,13 @@ public:
NS_IMETHOD CreateIterator(nsIIterator ** aIterator) ;
NS_IMETHOD AddDateTime(nsIDateTime * aDateTime);
NS_IMETHOD AddDateVector(nsIVector * aDateVector);
NS_IMETHOD AddDateVector(nsIArray * aDateVector);
protected:
~nsCalDayListCommand();
private:
nsIVector * mDateTimes ;
nsIArray * mDateTimes ;
};

8
calendar/modules/ui/command/src/nsCalDayListCommand.cpp
Просмотреть файл

@ -20,15 +20,15 @@
#include "nsCalDayListCommand.h"
#include "nsCalUICIID.h"
#include "nsCalUtilCIID.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsxpfcCIID.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kXPFCCommandIID, NS_IXPFC_COMMAND_IID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
nsCalDayListCommand :: nsCalDayListCommand()
{
@ -108,7 +108,7 @@ nsresult nsCalDayListCommand :: AddDateTime(nsIDateTime * aDateTime)
return NS_OK;
}
nsresult nsCalDayListCommand :: AddDateVector(nsIVector * aDateVector)
nsresult nsCalDayListCommand :: AddDateVector(nsIArray * aDateVector)
{
NS_IF_RELEASE(mDateTimes);

2
calendar/modules/ui/controller/inc/nsCalMonthContextController.h
Просмотреть файл

@ -273,7 +273,7 @@ protected:
nsresult AddToActionList(DateTime d);
void CommitArrow(int iDayVal, int iMonthVal);
void CommitDateList();
nsIVector * m_ActionDateList; // Interactive DateList as we move the mouse
nsIArray * m_ActionDateList; // Interactive DateList as we move the mouse
};

4
calendar/modules/ui/controller/src/nsCalMonthContextController.cpp
Просмотреть файл

@ -154,7 +154,7 @@ nsresult nsCalMonthContextController :: Init()
if (nsnull == m_ActionDateList)
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
@ -1253,7 +1253,7 @@ nsresult nsCalMonthContextController::AddToActionList(DateTime d)
nsdatetime->Init();
DateTime * dstar = new DateTime(d.getTime());
nsdatetime->SetDateTime(dstar);
if ( -1 == m_ActionDateList->InsertBinary(nsdatetime,(nsVectorCompareProc)nsDateTime_SortAscending, PR_FALSE /* do not allow dups */))
if ( -1 == m_ActionDateList->InsertBinary(nsdatetime,(nsArrayCompareProc)nsDateTime_SortAscending, PR_FALSE /* do not allow dups */))
{
NS_IF_RELEASE(nsdatetime);
}

4
xpfc/canvas/inc/nsXPFCCanvas.h
Просмотреть файл

@ -22,7 +22,7 @@
#include "nsxpfc.h"
#include "nsAgg.h"
#include "nsxpfcCIID.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsString.h"
#include "nsFont.h"
@ -282,7 +282,7 @@ public:
private:
nsILayout * mLayout;
nsIVector * mChildWidgets ;
nsIArray * mChildWidgets ;
nscolor mBackgroundColor;
nscolor mForegroundColor;
nscolor mBorderColor;

6
xpfc/canvas/inc/nsXPFCCanvasManager.h
Просмотреть файл

@ -25,7 +25,7 @@
#include "prmon.h"
#include "plstr.h"
#include "nsCom.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsIXPFCCanvasManager.h"
#include "nsIView.h"
@ -92,8 +92,8 @@ public:
PRMonitor * monitor;
public:
nsIVector * mViewList ;
nsIVector * mWidgetList ;
nsIArray * mViewList ;
nsIArray * mWidgetList ;
private:
nsIXPFCCanvas * mRootCanvas;

6
xpfc/canvas/src/nsXPFCCanvas.cpp
Просмотреть файл

@ -20,7 +20,7 @@
#include "nsAgg.h"
#include "nsxpfcCIID.h"
#include "nsXPFCCanvas.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsString.h"
#include "nsFont.h"
@ -823,7 +823,7 @@ nsresult nsXPFCCanvas :: SetModel(nsIModel * aModel)
nsresult nsXPFCCanvas :: Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res ;
@ -833,7 +833,7 @@ nsresult nsXPFCCanvas :: Init()
#define XPFC_DLL "libxpfc10.so"
#endif
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
nsRepository::RegisterFactory(kCVectorCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCVectorIteratorCID, XPFC_DLL, PR_FALSE, PR_FALSE);

8
xpfc/canvas/src/nsXPFCCanvasManager.cpp
Просмотреть файл

@ -129,8 +129,8 @@ nsresult nsXPFCCanvasManager::Init()
if (mViewList == nsnull)
{
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
@ -146,8 +146,8 @@ nsresult nsXPFCCanvasManager::Init()
if (mWidgetList == nsnull)
{
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,

4
xpfc/chrome/inc/nsXPFCMenuContainer.h
Просмотреть файл

@ -22,7 +22,7 @@
#include "nsIXPFCMenuContainer.h"
#include "nsIXPFCMenuBar.h"
#include "nsXPFCMenuItem.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsIXPFCCommandReceiver.h"
@ -68,7 +68,7 @@ private:
NS_IMETHOD ProcessActionCommand(nsString& aAction);
protected:
nsIVector * mChildMenus ;
nsIArray * mChildMenus ;
nsIShellInstance * mShellInstance;
nsIWebViewerContainer * mWebViewerContainer;
};

2
xpfc/chrome/src/nsXPFCMenuContainer.cpp
Просмотреть файл

@ -113,7 +113,7 @@ nsresult nsXPFCMenuContainer::QueryInterface(REFNSIID aIID, void** aInstancePtr)
nsresult nsXPFCMenuContainer::Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
kCVectorCID,

4
xpfc/core/inc/nsxpfcCIID.h
Просмотреть файл

@ -127,12 +127,12 @@
{0x92, 0x46, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
//8c091510-eb84-11d1-9244-00805f8a7ab6
#define NS_VECTOR_CID \
#define NS_ARRAY_CID \
{ 0x8c091510, 0xeb84, 0x11d1, \
{ 0x92, 0x44, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6 } }
//24439be0-eb85-11d1-9244-00805f8a7ab6
#define NS_VECTOR_ITERATOR_CID \
#define NS_ARRAY_ITERATOR_CID \
{ 0x24439be0, 0xeb85, 0x11d1, \
{ 0x92, 0x44, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6 } }

8
xpfc/core/inc/nsxpfcFactory.h
Просмотреть файл

@ -44,8 +44,8 @@
#include "nsXPFCDataCollectionManager.h"
#include "nsStreamManager.h"
#include "nsStreamObject.h"
#include "nsVector.h"
#include "nsVectorIterator.h"
#include "nsArray.h"
#include "nsArrayIterator.h"
#include "nsStack.h"
#include "nsLayout.h"
#include "nsBoxLayout.h"
@ -91,8 +91,8 @@ static NS_DEFINE_IID(kCXPButton, NS_XP_BUTTON_CID);
static NS_DEFINE_IID(kCXPItem, NS_XP_ITEM_CID);
static NS_DEFINE_IID(kCXPFCTabWidget, NS_XPFC_TABWIDGET_CID);
static NS_DEFINE_IID(kCXPFCTextWidget, NS_XPFC_TEXTWIDGET_CID);
static NS_DEFINE_IID(kCVector, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIterator, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVector, NS_ARRAY_CID);
static NS_DEFINE_IID(kCVectorIterator, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCLayout, NS_LAYOUT_CID);
static NS_DEFINE_IID(kILayout, NS_ILAYOUT_IID);
static NS_DEFINE_IID(kCBoxLayout, NS_BOXLAYOUT_CID);

4
xpfc/core/src/nsxpfcFactory.cpp
Просмотреть файл

@ -125,9 +125,9 @@ nsresult nsxpfcFactory::CreateInstance(nsISupports *aOuter,
} else if (mClassID.Equals(kCXPFCContentSink)) {
inst = (nsISupports *)(nsIXPFCXMLContentSink*)new nsXPFCXMLContentSink();
} else if (mClassID.Equals(kCVector)) {
inst = (nsISupports *)new nsVector();
inst = (nsISupports *)new nsArray();
} else if (mClassID.Equals(kCVectorIterator)) {
inst = (nsISupports *)new nsVectorIterator();
inst = (nsISupports *)new nsArrayIterator();
} else if (mClassID.Equals(kCStack)) {
inst = (nsISupports *)new nsStack();
} else if (mClassID.Equals(kCLayout)) {

4
xpfc/msg/test/src/nsMsgTest.cpp
Просмотреть файл

@ -254,8 +254,8 @@ nsresult nsMsgTest::RegisterFactories()
nsRepository::RegisterFactory(kCXPFCCanvasCID, XPFC_DLL, PR_FALSE, PR_FALSE);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
nsRepository::RegisterFactory(kCVectorCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCVectorIteratorCID, XPFC_DLL, PR_FALSE, PR_FALSE);

6
xpfc/observer/inc/nsXPFCObserverManager.h
Просмотреть файл

@ -25,7 +25,7 @@
#include "prmon.h"
#include "plstr.h"
#include "nsCom.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsIXPFCObserverManager.h"
@ -57,8 +57,8 @@ public:
PRMonitor * monitor;
private:
nsIVector * mList ;
nsIVector * mState ;
nsIArray * mList ;
nsIArray * mState ;
PRUint32 mNotificationCount;
nsIXPFCSubject * mOriginalNotifier;

8
xpfc/observer/src/nsXPFCObserverManager.cpp
Просмотреть файл

@ -127,8 +127,8 @@ nsresult nsXPFCObserverManager::Init()
{
if (mList == nsnull) {
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
@ -143,8 +143,8 @@ nsresult nsXPFCObserverManager::Init()
if (mState == nsnull) {
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,

4
xpfc/parser/inc/nsMenuManager.h
Просмотреть файл

@ -20,7 +20,7 @@
#define nsMenuManager_h___
#include "nsIMenuManager.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
class nsMenuManager : public nsIMenuManager
@ -45,7 +45,7 @@ protected:
private:
nsIXPFCMenuBar * mMenuBar;
nsIVector * mMenuContainers;
nsIArray * mMenuContainers;
PRUint32 mValidMenuID;
nsIXPFCCommandReceiver * mDefaultReceiver;

4
xpfc/parser/inc/nsXPFCToolbarManager.h
Просмотреть файл

@ -20,7 +20,7 @@
#define nsXPFCToolbarManager_h___
#include "nsIXPFCToolbarManager.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
class nsXPFCToolbarManager : public nsIXPFCToolbarManager
@ -38,7 +38,7 @@ protected:
~nsXPFCToolbarManager();
private:
nsIVector * mToolbars;
nsIArray * mToolbars;
};

6
xpfc/parser/inc/nsXPFCXMLContentSink.h
Просмотреть файл

@ -25,7 +25,7 @@
#include "nsIHTMLContentSink.h"
#include "nsIWebViewerContainer.h"
#include "nsxpfcCIID.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsIStack.h"
#include "nsHTMLTokens.h"
@ -88,8 +88,8 @@ private:
private:
nsIWebViewerContainer * mViewerContainer ;
nsIStack * mXPFCStack;
nsIVector * mOrphanMenuList;
nsIVector * mContainerList ;
nsIArray * mOrphanMenuList;
nsIArray * mContainerList ;
PRUint32 mState;
};

2
xpfc/parser/src/nsMenuManager.cpp
Просмотреть файл

@ -68,7 +68,7 @@ NS_IMPL_RELEASE(nsMenuManager)
nsresult nsMenuManager :: Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
kCVectorCID,

2
xpfc/parser/src/nsXPFCToolbarManager.cpp
Просмотреть файл

@ -62,7 +62,7 @@ NS_IMPL_RELEASE(nsXPFCToolbarManager)
nsresult nsXPFCToolbarManager :: Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
kCVectorCID,

6
xpfc/parser/src/nsXPFCXMLContentSink.cpp
Просмотреть файл

@ -86,7 +86,7 @@ nsXPFCXMLContentSink::nsXPFCXMLContentSink() : nsIHTMLContentSink()
mState = XPFC_PARSING_STATE_UNKNOWN;
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
kCVectorCID,
@ -111,8 +111,8 @@ nsXPFCXMLContentSink::nsXPFCXMLContentSink() : nsIHTMLContentSink()
if (mContainerList == nsnull) {
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,

4
xpfc/shell/inc/nsStreamManager.h
Просмотреть файл

@ -18,7 +18,7 @@
#include "nscore.h"
#include "nsIFactory.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
#include "nsIStreamManager.h"
#include "nsIXPFCCanvas.h"
@ -53,7 +53,7 @@ public:
nsIID *aSinkIID = nsnull);
private:
nsIVector * mStreamObjects;
nsIArray * mStreamObjects;
};

4
xpfc/shell/inc/nsXPFCDataCollectionManager.h
Просмотреть файл

@ -20,7 +20,7 @@
#define nsXPFCDataCollectionManager_h___
#include "nsIXPFCDataCollectionManager.h"
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsIIterator.h"
class nsCollectedData : public nsICollectedData
@ -58,7 +58,7 @@ protected:
~nsXPFCDataCollectionManager();
private:
nsIVector * mDataHands;
nsIArray * mDataHands;
};

2
xpfc/shell/src/nsStreamManager.cpp
Просмотреть файл

@ -77,7 +77,7 @@ NS_IMPL_ISUPPORTS(nsStreamManager,kIStreamManagerIID);
nsresult nsStreamManager::Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,

2
xpfc/shell/src/nsXPFCDataCollectionManager.cpp
Просмотреть файл

@ -59,7 +59,7 @@ NS_IMPL_RELEASE(nsXPFCDataCollectionManager)
nsresult nsXPFCDataCollectionManager :: Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
nsnull,
kCVectorCID,

4
xpfc/shell/src/unix/main.cpp
Просмотреть файл

@ -58,8 +58,8 @@ static NS_DEFINE_IID(kCXPItemCID, NS_XP_ITEM_CID);
static NS_DEFINE_IID(kCXPFCTextWidgetCID, NS_XPFC_TEXTWIDGET_CID);
static NS_DEFINE_IID(kCXPFCTabWidgetCID, NS_XPFC_TABWIDGET_CID);
static NS_DEFINE_IID(kCXPFCToolbarManagerCID, NS_XPFCTOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCstackCID, NS_STACK_CID);
static NS_DEFINE_IID(kCStreamManagerCID, NS_STREAM_MANAGER_CID);
static NS_DEFINE_IID(kCStreamObjectCID, NS_STREAM_OBJECT_CID);

4
xpfc/shell/src/windows/winmain.cpp
Просмотреть файл

@ -58,8 +58,8 @@ static NS_DEFINE_IID(kCXPFCTabWidgetCID, NS_XPFC_TABWIDGET_CID);
static NS_DEFINE_IID(kCXPFCToolbarManagerCID, NS_XPFCTOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kCStreamManagerCID, NS_STREAM_MANAGER_CID);
static NS_DEFINE_IID(kCStreamObjectCID, NS_STREAM_OBJECT_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCstackCID, NS_STACK_CID);
static NS_DEFINE_IID(kCBoxLayoutCID, NS_BOXLAYOUT_CID);

4
xpfc/util/inc/manifest.mn
Просмотреть файл

@ -13,8 +13,8 @@ EXPORTS = \
$(NULL)
PRIVATE_EXPORTS = \
nsVectorIterator.h \
nsVector.h \
nsArrayIterator.h \
nsArray.h \
nsStack.h \
nsxpfcutil.h \
nsUrlParser.h \

16
xpfc/util/inc/nsVector.h → xpfc/util/inc/nsArray.h
Просмотреть файл

@ -16,18 +16,18 @@
* Reserved.
*/
#ifndef nsVector_h___
#define nsVector_h___
#ifndef nsArray_h___
#define nsArray_h___
#include "nsIVector.h"
#include "nsIArray.h"
#include "nsVoidArray.h"
class nsVector : public nsIVector
class nsArray : public nsIArray
{
public:
nsVector();
nsArray();
NS_DECL_ISUPPORTS
@ -38,7 +38,7 @@ public:
NS_IMETHOD_(PRBool) Contains(nsComponent aComponent) ;
NS_IMETHOD_(PRUint32) IndexOf(nsComponent aComponent) ;
NS_IMETHOD_(nsComponent) ElementAt(PRUint32 aIndex) ;
NS_IMETHOD_(PRInt32) InsertBinary(nsComponent aComponent, nsVectorCompareProc aCompFn, PRBool bAllowDups);
NS_IMETHOD_(PRInt32) InsertBinary(nsComponent aComponent, nsArrayCompareProc aCompFn, PRBool bAllowDups);
NS_IMETHOD Insert(PRUint32 aIndex, nsComponent aComponent) ;
NS_IMETHOD Append(nsComponent aComponent) ;
@ -49,11 +49,11 @@ public:
NS_IMETHOD CreateIterator(nsIIterator ** aIterator) ;
protected:
~nsVector();
~nsArray();
private:
nsVoidArray * mVoidArray ;
};
#endif /* nsVector_h___ */
#endif /* nsArray_h___ */

18
xpfc/util/inc/nsVectorIterator.h → xpfc/util/inc/nsArrayIterator.h
Просмотреть файл

@ -16,21 +16,21 @@
* Reserved.
*/
#ifndef nsVectorIterator_h___
#define nsVectorIterator_h___
#ifndef nsArrayIterator_h___
#define nsArrayIterator_h___
#include "nsIIterator.h"
#include "nsIVector.h"
#include "nsIArray.h"
class nsVectorIterator : public nsIIterator
class nsArrayIterator : public nsIIterator
{
public:
nsVectorIterator();
nsArrayIterator();
NS_DECL_ISUPPORTS
NS_IMETHOD Init() ;
NS_IMETHOD Init(nsIVector * aVector) ;
NS_IMETHOD Init(nsIArray * aVector) ;
NS_IMETHOD First() ;
NS_IMETHOD Last() ;
@ -42,12 +42,12 @@ public:
NS_IMETHOD_(PRUint32) Count() ;
protected:
~nsVectorIterator();
~nsArrayIterator();
private:
nsIVector * mVector;
nsIArray * mVector;
PRUint32 mCurrentElement;
};
#endif /* nsVectorIterator_h___ */
#endif /* nsArrayIterator_h___ */

2
xpfc/util/public/manifest.mn
Просмотреть файл

@ -11,7 +11,7 @@ GDEPTH = ../../..
DEPTH = ../../..
EXPORTS = \
nsIVector.h \
nsIArray.h \
nsIIterator.h \
nsIStack.h \
$(NULL)

14
xpfc/util/public/nsIVector.h → xpfc/util/public/nsIArray.h
Просмотреть файл

@ -16,21 +16,21 @@
* Reserved.
*/
#ifndef nsIVector_h___
#define nsIVector_h___
#ifndef nsIArray_h___
#define nsIArray_h___
#include "nsISupports.h"
#include "nsIIterator.h"
//9d149d10-eb7f-11d1-9244-00805f8a7ab6
#define NS_IVECTOR_IID \
#define NS_IARRAY_IID \
{ 0x9d149d10, 0xeb7c, 0x11d1, \
{ 0x92, 0x44, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6 } }
typedef PRInt32 (*nsVectorCompareProc)(const nsComponent elem1, const nsComponent elem2 );
typedef PRInt32 (*nsArrayCompareProc)(const nsComponent elem1, const nsComponent elem2 );
class nsIVector : public nsISupports
class nsIArray : public nsISupports
{
public:
@ -41,7 +41,7 @@ public:
NS_IMETHOD_(PRBool) Empty() = 0 ;
NS_IMETHOD_(PRBool) Contains(nsComponent aComponent) = 0;
NS_IMETHOD_(PRUint32) IndexOf(nsComponent aComponent) = 0;
NS_IMETHOD_(PRInt32) InsertBinary(nsComponent aComponent, nsVectorCompareProc aCompFn, PRBool bAllowDups) = 0;
NS_IMETHOD_(PRInt32) InsertBinary(nsComponent aComponent, nsArrayCompareProc aCompFn, PRBool bAllowDups) = 0;
NS_IMETHOD_(nsComponent) ElementAt(PRUint32 aIndex) = 0 ;
NS_IMETHOD Insert(PRUint32 aIndex, nsComponent aComponent) = 0 ;
@ -54,4 +54,4 @@ public:
};
#endif /* nsIVector_h___ */
#endif /* nsIArray_h___ */

4
xpfc/util/src/manifest.mn
Просмотреть файл

@ -18,8 +18,8 @@ PRIVATE_EXPORTS = \
MODULE = xpfc
CPPSRCS = \
nsVectorIterator.cpp \
nsVector.cpp \
nsArrayIterator.cpp \
nsArray.cpp \
nsStack.cpp \
nsUrlParser.cpp \
$(NULL)

46
xpfc/util/src/nsVector.cpp → xpfc/util/src/nsArray.cpp
Просмотреть файл

@ -16,48 +16,48 @@
* Reserved.
*/
#include "nsVector.h"
#include "nsVectorIterator.h"
#include "nsArray.h"
#include "nsArrayIterator.h"
#include "nsxpfcCIID.h"
#include "nsxpfcutil.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorCID, NS_ARRAY_CID);
nsVector :: nsVector()
nsArray :: nsArray()
{
NS_INIT_REFCNT();
mVoidArray = nsnull ;
}
nsVector :: ~nsVector()
nsArray :: ~nsArray()
{
DeleteIfObject(mVoidArray) ;
}
NS_IMPL_QUERY_INTERFACE(nsVector, kCVectorCID)
NS_IMPL_ADDREF(nsVector)
NS_IMPL_RELEASE(nsVector)
NS_IMPL_QUERY_INTERFACE(nsArray, kCVectorCID)
NS_IMPL_ADDREF(nsArray)
NS_IMPL_RELEASE(nsArray)
nsresult nsVector :: Init()
nsresult nsArray :: Init()
{
mVoidArray = NewObject(nsVoidArray) ;
return NS_OK ;
}
PRUint32 nsVector :: Count()
PRUint32 nsArray :: Count()
{
return mVoidArray->Count() ;
}
PRBool nsVector :: Empty()
PRBool nsArray :: Empty()
{
return (Count() ? PR_TRUE : PR_FALSE) ;
}
PRBool nsVector :: Contains(nsComponent aComponent)
PRBool nsArray :: Contains(nsComponent aComponent)
{
if (IndexOf(aComponent))
return PR_TRUE ;
@ -65,12 +65,12 @@ PRBool nsVector :: Contains(nsComponent aComponent)
return PR_FALSE ;
}
PRUint32 nsVector :: IndexOf(nsComponent aComponent)
PRUint32 nsArray :: IndexOf(nsComponent aComponent)
{
return (mVoidArray->IndexOf(aComponent)) ;
}
nsComponent nsVector :: ElementAt(PRUint32 aIndex)
nsComponent nsArray :: ElementAt(PRUint32 aIndex)
{
return (mVoidArray->ElementAt(aIndex)) ; ;
}
@ -84,7 +84,7 @@ nsComponent nsVector :: ElementAt(PRUint32 aIndex)
* 0 means the element was inserted, no problems
* 1 means the element was not inserted because of an internal error
*/
PRInt32 nsVector::InsertBinary(nsComponent newElement, nsVectorCompareProc aCompareFn, PRBool bAllowDups)
PRInt32 nsArray::InsertBinary(nsComponent newElement, nsArrayCompareProc aCompareFn, PRBool bAllowDups)
{
PRInt32 iCurrent = 0;
PRInt32 iLeft = 0;
@ -116,7 +116,7 @@ PRInt32 nsVector::InsertBinary(nsComponent newElement, nsVectorCompareProc aComp
return 1;
}
nsresult nsVector :: Insert(PRUint32 aIndex, nsComponent aComponent)
nsresult nsArray :: Insert(PRUint32 aIndex, nsComponent aComponent)
{
nsresult res = NS_OK;
@ -127,7 +127,7 @@ nsresult nsVector :: Insert(PRUint32 aIndex, nsComponent aComponent)
return res ;
}
nsresult nsVector :: Append(nsComponent aComponent)
nsresult nsArray :: Append(nsComponent aComponent)
{
nsresult res = NS_OK;
@ -138,7 +138,7 @@ nsresult nsVector :: Append(nsComponent aComponent)
return res ;
}
nsresult nsVector :: Remove(nsComponent aComponent)
nsresult nsArray :: Remove(nsComponent aComponent)
{
if (PR_TRUE == mVoidArray->RemoveElement(aComponent))
return NS_OK ;
@ -146,14 +146,14 @@ nsresult nsVector :: Remove(nsComponent aComponent)
return NS_ERROR_FAILURE ;
}
nsresult nsVector :: RemoveAll()
nsresult nsArray :: RemoveAll()
{
mVoidArray->Clear();
return NS_OK ;
}
nsresult nsVector :: RemoveAt(PRUint32 aIndex)
nsresult nsArray :: RemoveAt(PRUint32 aIndex)
{
nsresult res = NS_OK;
@ -164,9 +164,9 @@ nsresult nsVector :: RemoveAt(PRUint32 aIndex)
return res ;
}
nsresult nsVector :: CreateIterator(nsIIterator ** aIterator)
nsresult nsArray :: CreateIterator(nsIIterator ** aIterator)
{
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
nsresult res ;
@ -178,7 +178,7 @@ nsresult nsVector :: CreateIterator(nsIIterator ** aIterator)
nsRepository::RegisterFactory(kCVectorIteratorCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsVectorIterator * aVectorIterator ;
nsArrayIterator * aVectorIterator ;
*aIterator = nsnull;

36
xpfc/util/src/nsVectorIterator.cpp → xpfc/util/src/nsArrayIterator.cpp
Просмотреть файл

@ -19,65 +19,65 @@
#include "nscore.h"
#include "nsIIterator.h"
#include "nsxpfcCIID.h"
#include "nsIVector.h"
#include "nsVectorIterator.h"
#include "nsIArray.h"
#include "nsArrayIterator.h"
#include "nsxpfcutil.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_ARRAY_ITERATOR_CID);
nsVectorIterator :: nsVectorIterator()
nsArrayIterator :: nsArrayIterator()
{
NS_INIT_REFCNT();
mCurrentElement = 0 ;
}
nsVectorIterator :: ~nsVectorIterator()
nsArrayIterator :: ~nsArrayIterator()
{
}
NS_IMPL_QUERY_INTERFACE(nsVectorIterator, kCVectorIteratorCID)
NS_IMPL_ADDREF(nsVectorIterator)
NS_IMPL_RELEASE(nsVectorIterator)
NS_IMPL_QUERY_INTERFACE(nsArrayIterator, kCVectorIteratorCID)
NS_IMPL_ADDREF(nsArrayIterator)
NS_IMPL_RELEASE(nsArrayIterator)
nsresult nsVectorIterator :: Init()
nsresult nsArrayIterator :: Init()
{
mCurrentElement = 0 ;
return NS_OK ;
}
nsresult nsVectorIterator :: Init(nsIVector * aVector)
nsresult nsArrayIterator :: Init(nsIArray * aVector)
{
mVector = aVector;
mCurrentElement = 0 ;
return NS_OK ;
}
nsresult nsVectorIterator :: First()
nsresult nsArrayIterator :: First()
{
mCurrentElement = 0 ;
return NS_OK ;
}
nsresult nsVectorIterator :: Last()
nsresult nsArrayIterator :: Last()
{
mCurrentElement = Count() - 1 ;
return NS_OK ;
}
nsresult nsVectorIterator :: Next()
nsresult nsArrayIterator :: Next()
{
mCurrentElement++;
return NS_OK ;
}
nsresult nsVectorIterator :: Previous()
nsresult nsArrayIterator :: Previous()
{
mCurrentElement--;
return NS_OK ;
}
PRBool nsVectorIterator :: IsDone()
PRBool nsArrayIterator :: IsDone()
{
if (mVector == nsnull)
return PR_TRUE;
@ -88,7 +88,7 @@ PRBool nsVectorIterator :: IsDone()
return PR_FALSE ;
}
PRBool nsVectorIterator :: IsFirst()
PRBool nsArrayIterator :: IsFirst()
{
if (mVector == nsnull)
return PR_TRUE;
@ -99,7 +99,7 @@ PRBool nsVectorIterator :: IsFirst()
return PR_FALSE ;
}
nsComponent nsVectorIterator :: CurrentItem()
nsComponent nsArrayIterator :: CurrentItem()
{
if (IsDone())
return nsnull ;
@ -107,7 +107,7 @@ nsComponent nsVectorIterator :: CurrentItem()
return (mVector->ElementAt(mCurrentElement));
}
PRUint32 nsVectorIterator :: Count()
PRUint32 nsArrayIterator :: Count()
{
return (mVector->Count());
}

12
xpfc/util/src/nsUtilFactory.cpp
Просмотреть файл

@ -21,14 +21,14 @@
#include "nsISupports.h"
#include "nsCalUtilCIID.h"
#include "nsVector.h"
#include "nsVectorIterator.h"
#include "nsArray.h"
#include "nsArrayIterator.h"
#include "nsDateTime.h"
#include "nsDuration.h"
#include "nsStack.h"
static NS_DEFINE_IID(kCVector, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIterator, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCVector, NS_ARRAY_CID);
static NS_DEFINE_IID(kCVectorIterator, NS_ARRAY_ITERATOR_CID);
static NS_DEFINE_IID(kCDateTime, NS_DATETIME_CID);
static NS_DEFINE_IID(kCDuration, NS_DURATION_CID);
static NS_DEFINE_IID(kCStack, NS_STACK_CID);
@ -122,10 +122,10 @@ nsresult nsUtilFactory::CreateInstance(nsISupports *aOuter,
nsISupports *inst = nsnull;
if (mClassID.Equals(kCVector)) {
inst = (nsISupports *)new nsVector();
inst = (nsISupports *)new nsArray();
}
else if (mClassID.Equals(kCVectorIterator)) {
inst = (nsISupports *)new nsVectorIterator();
inst = (nsISupports *)new nsArrayIterator();
}
else if (mClassID.Equals(kCStack)) {
inst = (nsISupports *)new nsStack();