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

Changed all GetIID to use the new nsCOMTypeInfo

This commit is contained in:
rods%netscape.com 1999-07-15 14:55:23 +00:00
Родитель 2c151c8f14
Коммит bd7c50f72f
11 изменённых файлов: 36 добавлений и 55 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
widget/src/windows/nsComboBox.cpp
Просмотреть файл

@ -180,15 +180,13 @@ nsComboBox::~nsComboBox()
//-------------------------------------------------------------------------
nsresult nsComboBox::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
static NS_DEFINE_IID(kInsComboBoxIID, NS_ICOMBOBOX_IID);
static NS_DEFINE_IID(kInsListWidgetIID, NS_ILISTWIDGET_IID);
if (aIID.Equals(kInsComboBoxIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsIComboBox>::GetIID())) {
*aInstancePtr = (void*) ((nsIComboBox*)this);
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kInsListWidgetIID)) {
else if (aIID.Equals(nsCOMTypeInfo<nsIListWidget>::GetIID())) {
*aInstancePtr = (void*) ((nsIListWidget*)this);
NS_ADDREF_THIS();
return NS_OK;

51
widget/src/windows/nsContextMenu.cpp
Просмотреть файл

@ -39,13 +39,6 @@
#include "nsIMenuListener.h"
#include "nsIComponentManager.h"
// IIDs
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIContextMenuIID, NS_ICONTEXTMENU_IID);
static NS_DEFINE_IID(kIMenuIID, NS_IMENU_IID);
static NS_DEFINE_IID(kIMenuItemIID, NS_IMENUITEM_IID);
static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID);
// CIDs
#include "nsWidgetsCID.h"
static NS_DEFINE_IID(kContextMenuCID, NS_CONTEXTMENU_CID);
@ -61,17 +54,17 @@ nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(kIContextMenuIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsIContextMenu>::GetIID())) {
*aInstancePtr = (void*)(nsIContextMenu*) this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIMenuListenerIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsIMenuListener>::GetIID())) {
*aInstancePtr = (void*)(nsIMenuListener*)this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kISupportsIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = (void*)(nsISupports*)(nsIContextMenu*)this;
NS_ADDREF_THIS();
return NS_OK;
@ -127,7 +120,7 @@ NS_METHOD nsContextMenu::Create(nsISupports *aParent, const nsString& anAlignmen
if(aParent)
{
nsIWidget * parent = nsnull;
aParent->QueryInterface(kIWidgetIID, (void**) &parent); // This does the addref
aParent->QueryInterface(nsCOMTypeInfo<nsIWidget>::GetIID(), (void**) &parent); // This does the addref
if(parent)
{
mParentWindow = parent;
@ -145,7 +138,7 @@ NS_METHOD nsContextMenu::GetParent(nsISupports*& aParent)
{
aParent = nsnull;
if (nsnull != mParentWindow) {
return mParentWindow->QueryInterface(kISupportsIID,(void**)&aParent);
return mParentWindow->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(),(void**)&aParent);
}
return NS_ERROR_FAILURE;
@ -159,7 +152,7 @@ NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
{
// Figure out what we're adding
nsIMenuItem * menuitem = nsnull;
aItem->QueryInterface(kIMenuItemIID, (void**) &menuitem);
aItem->QueryInterface(nsCOMTypeInfo<nsIMenuItem>::GetIID(), (void**) &menuitem);
if(menuitem)
{
// case menuitem
@ -169,7 +162,7 @@ NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
else
{
nsIMenu * menu = nsnull;
aItem->QueryInterface(kIMenuIID, (void**) &menu);
aItem->QueryInterface(nsCOMTypeInfo<nsIMenu>::GetIID(), (void**) &menu);
if(menu)
{
// case menu
@ -296,7 +289,7 @@ NS_METHOD nsContextMenu::InsertItemAt(const PRUint32 aCount, nsISupports * aMenu
NS_METHOD nsContextMenu::InsertSeparator(const PRUint32 aCount)
{
nsISupports * supports = nsnull;
QueryInterface(kISupportsIID, (void**) &supports);
QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
nsMenuItem * item = new nsMenuItem();
if(supports) {
item->Create(supports, "", PR_FALSE);
@ -479,12 +472,12 @@ nsEventStatus nsContextMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
if (identifier > 0) {
// Dispatch to MenuItemSelected
nsIContextMenu * menu;
QueryInterface(kIContextMenuIID, (void**) &menu);
QueryInterface(nsCOMTypeInfo<nsIContextMenu>::GetIID(), (void**) &menu);
nsIMenuItem * menuItem = FindMenuItem(menu, identifier);
NS_RELEASE(menu);
if (menuItem) {
nsIMenuListener * listener;
if (NS_OK == menuItem->QueryInterface(kIMenuListenerIID, (void **)&listener)) {
if (NS_OK == menuItem->QueryInterface(nsCOMTypeInfo<nsIMenuListener>::GetIID(), (void **)&listener)) {
listener->MenuItemSelected(aMenuEvent);
NS_RELEASE(listener);
}
@ -504,12 +497,12 @@ nsIMenuItem * nsContextMenu::FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId)
nsIContextMenu * menu;
aMenu->GetItemAt(i, item);
if (NS_OK == item->QueryInterface(kIMenuItemIID, (void **)&menuItem)) {
if (NS_OK == item->QueryInterface(nsCOMTypeInfo<nsIMenuItem>::GetIID(), (void **)&menuItem)) {
if (((nsMenuItem *)menuItem)->GetCmdId() == (PRInt32)aId) {
NS_RELEASE(item);
return menuItem;
}
} else if (NS_OK == item->QueryInterface(kIContextMenuIID, (void **)&menu)) {
} else if (NS_OK == item->QueryInterface(nsCOMTypeInfo<nsIContextMenu>::GetIID(), (void **)&menu)) {
nsIMenuItem * fndItem = FindMenuItem(menu, aId);
NS_RELEASE(menu);
if (nsnull != fndItem) {
@ -609,12 +602,12 @@ void nsContextMenu::LoadMenuItem(
menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
// Create nsMenuItem
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, kIMenuItemIID, (void**)&pnsMenuItem);
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, nsCOMTypeInfo<nsIMenuItem>::GetIID(), (void**)&pnsMenuItem);
if (NS_OK == rv) {
pnsMenuItem->Create(pParentMenu, menuitemName, 0);
nsISupports * supports = nsnull;
pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
pnsMenuItem->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pParentMenu->AddItem(supports); // Parent should now own menu item
NS_RELEASE(supports);
@ -658,11 +651,11 @@ void nsContextMenu::LoadSubMenu(
// Create nsMenu
nsIMenu * pnsMenu = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, kIMenuIID, (void**)&pnsMenu);
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, nsCOMTypeInfo<nsIMenu>::GetIID(), (void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create
nsISupports * supports = nsnull;
pParentMenu->QueryInterface(kISupportsIID, (void**) &supports);
pParentMenu->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pnsMenu->Create(supports, menuName);
NS_RELEASE(supports); // Balance QI
@ -671,7 +664,7 @@ void nsContextMenu::LoadSubMenu(
// Make nsMenu a child of parent nsMenu. The parent takes ownership
supports = nsnull;
pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
pnsMenu->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pParentMenu->AddItem(supports);
NS_RELEASE(supports);
@ -702,12 +695,12 @@ void nsContextMenu::LoadMenuItem(
menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
// Create nsMenuItem
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, kIMenuItemIID, (void**)&pnsMenuItem);
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, nsCOMTypeInfo<nsIMenuItem>::GetIID(), (void**)&pnsMenuItem);
if (NS_OK == rv) {
pnsMenuItem->Create(pParentMenu, menuitemName, 0);
nsISupports * supports = nsnull;
pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
pnsMenuItem->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pParentMenu->AddItem(supports); // Parent should now own menu item
NS_RELEASE(supports);
@ -751,11 +744,11 @@ void nsContextMenu::LoadSubMenu(
// Create nsMenu
nsIMenu * pnsMenu = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, kIMenuIID, (void**)&pnsMenu);
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, nsCOMTypeInfo<nsIMenu>::GetIID(), (void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create
nsISupports * supports = nsnull;
pParentMenu->QueryInterface(kISupportsIID, (void**) &supports);
pParentMenu->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pnsMenu->Create(supports, menuName);
NS_RELEASE(supports); // Balance QI
@ -764,7 +757,7 @@ void nsContextMenu::LoadSubMenu(
// Make nsMenu a child of parent nsMenu. The parent takes ownership
supports = nsnull;
pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
pnsMenu->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pParentMenu->AddItem(supports);
NS_RELEASE(supports);

3
widget/src/windows/nsFileWidget.cpp
Просмотреть файл

@ -26,7 +26,6 @@
#include <windows.h>
#include <SHLOBJ.H>
static NS_DEFINE_IID(kIFileWidgetIID, NS_IFILEWIDGET_IID);
NS_IMPL_ADDREF(nsFileWidget)
NS_IMPL_RELEASE(nsFileWidget)
@ -68,7 +67,7 @@ nsresult nsFileWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
nsresult rv = NS_NOINTERFACE;
if (aIID.Equals(kIFileWidgetIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsIFileWidget>::GetIID())) {
*aInstancePtr = (void*) ((nsIFileWidget*)this);
NS_ADDREF_THIS();
return NS_OK;

4
widget/src/windows/nsFontRetrieverService.cpp
Просмотреть файл

@ -69,13 +69,13 @@ nsresult nsFontRetrieverService::QueryInterface(const nsIID& aIID, void** aInsta
nsresult rv = NS_NOINTERFACE;
if (aIID.Equals(nsIFontRetrieverService::GetIID())) {
if (aIID.Equals(nsCOMTypeInfo<nsIFontRetrieverService>::GetIID())) {
*aInstancePtr = (void*) ((nsIFontRetrieverService*)this);
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsIFontNameIterator::GetIID())) {
if (aIID.Equals(nsCOMTypeInfo<nsIFontNameIterator>::GetIID())) {
*aInstancePtr = (void*) ((nsIFontNameIterator*)this);
NS_ADDREF_THIS();
return NS_OK;

2
widget/src/windows/nsFontSizeIterator.cpp
Просмотреть файл

@ -25,7 +25,7 @@
NS_IMPL_ADDREF(nsFontSizeIterator)
NS_IMPL_RELEASE(nsFontSizeIterator)
NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, nsIFontSizeIterator::GetIID())
NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, nsCOMTypeInfo<nsIFontSizeIterator>::GetIID())
//----------------------------------------------------------
nsFontSizeIterator::nsFontSizeIterator()

6
widget/src/windows/nsListBox.cpp
Просмотреть файл

@ -251,15 +251,13 @@ nsresult nsListBox::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr);
static NS_DEFINE_IID(kInsListBoxIID, NS_ILISTBOX_IID);
static NS_DEFINE_IID(kInsListWidgetIID, NS_ILISTWIDGET_IID);
if (result == NS_NOINTERFACE) {
if (aIID.Equals(kInsListBoxIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsIListBox>::GetIID())) {
*aInstancePtr = (void*) ((nsIListBox*)this);
NS_ADDREF_THIS();
result = NS_OK;
}
else if (aIID.Equals(kInsListWidgetIID)) {
else if (aIID.Equals(nsCOMTypeInfo<nsIListWidget>::GetIID())) {
*aInstancePtr = (void*) ((nsIListWidget*)this);
NS_ADDREF_THIS();
result = NS_OK;

2
widget/src/windows/nsSound.cpp
Просмотреть файл

@ -72,7 +72,7 @@ SoundImpl::~SoundImpl()
NS_IMPL_ISUPPORTS(SoundImpl, nsISound::GetIID());
NS_IMPL_ISUPPORTS(SoundImpl, nsCOMTypeInfo<nsISound>::GetIID());
NS_IMETHODIMP

3
widget/src/windows/nsTabWidget.cpp
Просмотреть файл

@ -59,8 +59,7 @@ nsresult nsTabWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr);
static NS_DEFINE_IID(kInsTabWidgetIID, NS_ITABWIDGET_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsTabWidgetIID)) {
if (result == NS_NOINTERFACE && aIID.Equals(nsCOMTypeInfo<nsITabWidget>::GetIID())) {
*aInstancePtr = (void*) ((nsITabWidget*)this);
NS_ADDREF_THIS();
result = NS_OK;

8
widget/src/windows/nsTextAreaWidget.cpp
Просмотреть файл

@ -85,17 +85,13 @@ void nsTextAreaWidget::SetUpForPaint(HDC aHDC)
nsresult nsTextAreaWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
static NS_DEFINE_IID(kITextAreaWidgetIID, NS_ITEXTAREAWIDGET_IID);
static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID);
if (aIID.Equals(kITextAreaWidgetIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsITextAreaWidget>::GetIID())) {
nsITextAreaWidget* textArea = this;
*aInstancePtr = (void*) (textArea);
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIWidgetIID))
else if (aIID.Equals(nsCOMTypeInfo<nsIWidget>::GetIID()))
{
nsIWidget* widget = this;
*aInstancePtr = (void*) (widget);

3
widget/src/windows/nsTextWidget.cpp
Просмотреть файл

@ -67,8 +67,7 @@ nsresult nsTextWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr);
static NS_DEFINE_IID(kInsTextWidgetIID, NS_ITEXTWIDGET_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsTextWidgetIID)) {
if (result == NS_NOINTERFACE && aIID.Equals(nsCOMTypeInfo<nsITextWidget>::GetIID())) {
*aInstancePtr = (void*) ((nsITextWidget*)this);
NS_ADDREF_THIS();
result = NS_OK;

3
widget/src/windows/nsTooltipWidget.cpp
Просмотреть файл

@ -59,8 +59,7 @@ nsresult nsTooltipWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr);
static NS_DEFINE_IID(kInsTooltipWidgetIID, NS_ITOOLTIPWIDGET_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsTooltipWidgetIID)) {
if (result == NS_NOINTERFACE && aIID.Equals(nsCOMTypeInfo<nsITooltipWidget>::GetIID())) {
*aInstancePtr = (void*) ((nsITooltipWidget*)this);
NS_ADDREF_THIS();
result = NS_OK;