Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed errant |QueryInterface()|s in favor of appropriate macros, as part of bug#23737. Changed |NS_DEFINE_IID| to |NS_DEFINE_CID| where appropriate; or else removed it, and fixed up clients to use |NS_GET_IID| in the appropriate spots. Built and ran pre-checkin tests. r=pinkerton

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@59313 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%netscape.com 2000-01-31 23:45:42 +00:00
parent 11bee2e856
commit 21c1012e1b
22 changed files with 80 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/xpfe/appshell/public/nsIDOMXPConnectFactory.h
View File

@ -34,7 +34,7 @@
class nsIDOMXPConnectFactory : public nsISupports {
public:
static const nsIID& IID() { static nsIID iid = NS_IDOMXPCONNECTFACTORY_IID; return iid; }
static const nsIID& GetIID() { static nsIID iid = NS_IDOMXPCONNECTFACTORY_IID; return iid; }
NS_IMETHOD CreateInstance(const nsString& aProgID, nsISupports** aReturn)=0;
};

12
mozilla/xpfe/appshell/src/nsAppShellFactory.cpp
View File

@ -39,12 +39,12 @@
nsresult NS_NewAppShellServiceFactory(nsIFactory** aFactory);
nsresult NS_NewXPConnectFactoryFactory(nsIFactory** aResult);
static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_IID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
static NS_DEFINE_IID(kProtocolHelperCID, NS_PROTOCOL_HELPER_CID);
static NS_DEFINE_IID(kXPConnectFactoryCID, NS_XPCONNECTFACTORY_CID);
static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID);
static NS_DEFINE_IID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
static NS_DEFINE_CID(kProtocolHelperCID, NS_PROTOCOL_HELPER_CID);
static NS_DEFINE_CID(kXPConnectFactoryCID, NS_XPCONNECTFACTORY_CID);
static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID);
static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
static NS_DEFINE_CID(kSessionHistoryCID, NS_SESSIONHISTORY_CID);

5
mozilla/xpfe/appshell/src/nsAppShellNameSet.cpp
View File

@ -28,8 +28,7 @@
#include "nsAppShellCIDs.h"
static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID);
static NS_DEFINE_IID(kXPConnectFactoryCID, NS_XPCONNECTFACTORY_CID);
static NS_DEFINE_CID(kXPConnectFactoryCID, NS_XPCONNECTFACTORY_CID);
nsAppShellNameSet::nsAppShellNameSet()
{
@ -40,7 +39,7 @@ nsAppShellNameSet::~nsAppShellNameSet()
{
}
NS_IMPL_ISUPPORTS(nsAppShellNameSet, kIScriptExternalNameSetIID);
NS_IMPL_ISUPPORTS1(nsAppShellNameSet, nsIScriptExternalNameSet);

40
mozilla/xpfe/appshell/src/nsAppShellService.cpp
View File

@ -72,22 +72,11 @@
#include "jsapi.h"
/* Define Class IDs */
static NS_DEFINE_IID(kAppShellCID, NS_APPSHELL_CID);
static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_IID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID);
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_CID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID);
static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
static NS_DEFINE_IID(kMetaCharsetCID, NS_META_CHARSET_CID);
/* Define Interface IDs */
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
static NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID);
static NS_DEFINE_IID(kIWebShellWindowIID, NS_IWEBSHELL_WINDOW_IID);
static NS_DEFINE_IID(kIScriptNameSetRegistryIID, NS_ISCRIPTNAMESETREGISTRY_IID);
static NS_DEFINE_IID(kIWindowMediatorIID,NS_IWINDOWMEDIATOR_IID);
static NS_DEFINE_IID(kIMetaCharsetServiceIID, NS_IMETA_CHARSET_SERVICE_IID);
static NS_DEFINE_CID(kMetaCharsetCID, NS_META_CHARSET_CID);
// copied from nsEventQueue.cpp
@ -193,7 +182,7 @@ nsAppShellService::Initialize( nsICmdLineService *aCmdLineService )
// Create the Event Queue for the UI thread...
nsIEventQueueService* eventQService;
rv = nsServiceManager::GetService(kEventQueueServiceCID,
kIEventQueueServiceIID,
NS_GET_IID(nsIEventQueueService),
(nsISupports **)&eventQService);
if (NS_OK == rv) {
// XXX: What if this fails?
@ -203,7 +192,7 @@ nsAppShellService::Initialize( nsICmdLineService *aCmdLineService )
// Register the nsAppShellNameSet with the global nameset registry...
nsIScriptNameSetRegistry *registry;
rv = nsServiceManager::GetService(kCScriptNameSetRegistryCID,
kIScriptNameSetRegistryIID,
NS_GET_IID(nsIScriptNameSetRegistry),
(nsISupports **)&registry);
if (NS_FAILED(rv)) {
goto done;
@ -222,7 +211,7 @@ nsAppShellService::Initialize( nsICmdLineService *aCmdLineService )
nsIMetaCharsetService* metacharset;
rv = nsServiceManager::GetService(kMetaCharsetCID,
kIMetaCharsetServiceIID,
NS_GET_IID(nsIMetaCharsetService),
(nsISupports **) &metacharset);
if(NS_FAILED(rv)) {
goto done;
@ -234,7 +223,7 @@ nsAppShellService::Initialize( nsICmdLineService *aCmdLineService )
rv = nsServiceManager::ReleaseService(kMetaCharsetCID, metacharset);
// Create widget application shell
rv = nsComponentManager::CreateInstance(kAppShellCID, nsnull, kIAppShellIID,
rv = nsComponentManager::CreateInstance(kAppShellCID, nsnull, NS_GET_IID(nsIAppShell),
(void**)&mAppShell);
if (NS_FAILED(rv)) {
goto done;
@ -252,7 +241,7 @@ nsAppShellService::Initialize( nsICmdLineService *aCmdLineService )
RegisterObserver(PR_TRUE);
// enable window mediation
rv = nsServiceManager::GetService(kWindowMediatorCID, kIWindowMediatorIID,
rv = nsServiceManager::GetService(kWindowMediatorCID, NS_GET_IID(nsIWindowMediator),
(nsISupports**) &mWindowMediator);
// CreateHiddenWindow(); // rjc: now require this to be explicitly called
@ -627,7 +616,7 @@ nsAppShellService::JustCreateTopWindow(nsIWebShellWindow *aParent,
if (NS_SUCCEEDED(rv)) {
// this does the AddRef of the return value
rv = window->QueryInterface(kIWebShellWindowIID, (void **) aResult);
rv = window->QueryInterface(NS_GET_IID(nsIWebShellWindow), (void **) aResult);
#if 0
// If intrinsically sized, don't show until we have the size figured out
// (6 Dec 99: this is causing new windows opened from anchor links to
@ -788,20 +777,19 @@ nsAppShellService::RunModalDialog(
/*
* Register a new top level window (created elsewhere)
*/
static NS_DEFINE_IID(kIWebShellContainerIID, NS_IWEB_SHELL_CONTAINER_IID);
NS_IMETHODIMP
nsAppShellService::RegisterTopLevelWindow(nsIWebShellWindow* aWindow)
{
nsresult rv;
nsIWebShellContainer* wsc;
rv = aWindow->QueryInterface(kIWebShellContainerIID, (void **) &wsc);
rv = aWindow->QueryInterface(NS_GET_IID(nsIWebShellContainer), (void **) &wsc);
if (NS_SUCCEEDED(rv)) {
mWindowList->AppendElement(wsc);
NS_RELEASE(wsc);
nsIWindowMediator* service;
if (NS_SUCCEEDED(nsServiceManager::GetService(kWindowMediatorCID, kIWindowMediatorIID, (nsISupports**) &service ) ) )
if (NS_SUCCEEDED(nsServiceManager::GetService(kWindowMediatorCID, NS_GET_IID(nsIWindowMediator), (nsISupports**) &service ) ) )
{
service->RegisterWindow( aWindow);
nsServiceManager::ReleaseService(kWindowMediatorCID, service);
@ -825,7 +813,7 @@ nsAppShellService::UnregisterTopLevelWindow(nsIWebShellWindow* aWindow)
}
nsIWindowMediator* service;
if (NS_SUCCEEDED(nsServiceManager::GetService(kWindowMediatorCID, kIWindowMediatorIID, (nsISupports**) &service ) ) )
if (NS_SUCCEEDED(nsServiceManager::GetService(kWindowMediatorCID, NS_GET_IID(nsIWindowMediator), (nsISupports**) &service ) ) )
{
service->UnregisterWindow( aWindow );
nsServiceManager::ReleaseService(kWindowMediatorCID, service);
@ -834,7 +822,7 @@ nsAppShellService::UnregisterTopLevelWindow(nsIWebShellWindow* aWindow)
nsresult rv;
nsIWebShellContainer* wsc;
rv = aWindow->QueryInterface(kIWebShellContainerIID, (void **) &wsc);
rv = aWindow->QueryInterface(NS_GET_IID(nsIWebShellContainer), (void **) &wsc);
if (NS_SUCCEEDED(rv)) {
mWindowList->RemoveElement(wsc);
NS_RELEASE(wsc);

8
mozilla/xpfe/appshell/src/nsCommandLineService.cpp
View File

@ -30,11 +30,7 @@
/* Define Class IDs */
static NS_DEFINE_IID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
/* Define Interface IDs */
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
class nsCmdLineService : public nsICmdLineService
@ -323,7 +319,7 @@ nsCmdLineServiceFactory::~nsCmdLineServiceFactory()
{
}
NS_IMPL_ISUPPORTS(nsCmdLineServiceFactory, kIFactoryIID);
NS_IMPL_ISUPPORTS1(nsCmdLineServiceFactory, nsIFactory);
nsresult

3
mozilla/xpfe/appshell/src/nsDialogParamBlock.cpp
View File

@ -114,10 +114,9 @@ NS_IMETHODIMP nsDialogParamBlock::SetString(PRInt32 inIndex, const PRUnichar *in
return rv;
}
static NS_DEFINE_IID(kIDialogParamBlock, NS_GET_IID(nsIDialogParamBlock) );
NS_IMPL_ADDREF(nsDialogParamBlock);
NS_IMPL_RELEASE(nsDialogParamBlock);
NS_IMPL_QUERY_INTERFACE(nsDialogParamBlock, kIDialogParamBlock);
NS_IMPL_QUERY_INTERFACE1(nsDialogParamBlock, nsIDialogParamBlock)
// Entry point to create nsAppShellService factory instances...
NS_DEF_FACTORY(DialogParamBlock, nsDialogParamBlock)

8
mozilla/xpfe/appshell/src/nsFileLocations.cpp
View File

@ -53,8 +53,6 @@
#include "prenv.h"
#include "prmem.h"
static NS_DEFINE_IID(kIFileLocatorIID, NS_IFILELOCATOR_IID);
// for profile manager
static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
@ -531,8 +529,6 @@ void nsSpecialFileSpec::operator = (Type aType)
// Implementation of nsIFileLocator
//========================================================================================
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
//========================================================================================
class nsFileLocator : public nsIFileLocator
//========================================================================================
@ -569,7 +565,7 @@ nsFileLocator::~nsFileLocator()
{
}
NS_IMPL_ISUPPORTS(nsFileLocator, kIFileLocatorIID);
NS_IMPL_ISUPPORTS1(nsFileLocator, nsIFileLocator);
//----------------------------------------------------------------------------------------
NS_IMETHODIMP nsFileLocator::GetFileLocation(
@ -656,7 +652,7 @@ nsFileLocatorFactory::~nsFileLocatorFactory()
{
}
NS_IMPL_ISUPPORTS(nsFileLocatorFactory, kIFactoryIID);
NS_IMPL_ISUPPORTS1(nsFileLocatorFactory, nsIFactory);
//----------------------------------------------------------------------------------------
nsresult nsFileLocatorFactory::CreateInstance(nsISupports *aOuter,

11
mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp
View File

@ -32,16 +32,7 @@
#include "nsXPComFactory.h"
/* Define Class IDs */
static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
/* Define Interface IDs */
static NS_DEFINE_IID(kIAppShellServiceIID, NS_IAPPSHELL_SERVICE_IID);
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_CID( kCommonDialogsCID, NS_CommonDialog_CID);

12
mozilla/xpfe/appshell/src/nsSessionHistory.cpp
View File

@ -38,13 +38,7 @@
}
/* Define Class IDs */
static NS_DEFINE_IID(kWebShellCID, NS_WEB_SHELL_CID);
/* Define Interface IDs */
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kISessionHistoryIID, NS_ISESSIONHISTORY_IID);
static NS_DEFINE_IID(kIHistoryEntryIID, NS_IHISTORY_ENTRY_IID);
static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID);
// Advance declarations
@ -797,7 +791,7 @@ nsSessionHistory::~nsSessionHistory()
}
//ISupports...
NS_IMPL_ISUPPORTS(nsSessionHistory, kISessionHistoryIID);
NS_IMPL_ISUPPORTS1(nsSessionHistory, nsISessionHistory);
/**
* Called to a new page is visited either through link click or
@ -1425,7 +1419,7 @@ nsSessionHistoryFactory::~nsSessionHistoryFactory()
{
}
NS_IMPL_ISUPPORTS(nsSessionHistoryFactory, kIFactoryIID);
NS_IMPL_ISUPPORTS1(nsSessionHistoryFactory, nsIFactory);
nsresult

84
mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
View File

@ -112,16 +112,16 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#include "nsIPopupSetFrame.h"
/* Define Class IDs */
static NS_DEFINE_IID(kWindowCID, NS_WINDOW_CID);
static NS_DEFINE_IID(kWebShellCID, NS_WEB_SHELL_CID);
static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_IID(kAppShellCID, NS_APPSHELL_CID);
static NS_DEFINE_CID(kWindowCID, NS_WINDOW_CID);
static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID);
static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
#include "nsWidgetsCID.h"
static NS_DEFINE_IID(kMenuBarCID, NS_MENUBAR_CID);
static NS_DEFINE_IID(kMenuCID, NS_MENU_CID);
static NS_DEFINE_IID(kMenuItemCID, NS_MENUITEM_CID);
static NS_DEFINE_IID(kContextMenuCID, NS_CONTEXTMENU_CID);
static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID);
static NS_DEFINE_CID(kMenuCID, NS_MENU_CID);
static NS_DEFINE_CID(kMenuItemCID, NS_MENUITEM_CID);
static NS_DEFINE_CID(kContextMenuCID, NS_CONTEXTMENU_CID);
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
@ -130,35 +130,11 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
static NS_DEFINE_IID(kIDocumentLoaderFactoryIID, NS_IDOCUMENTLOADERFACTORY_IID);
static NS_DEFINE_CID(kLayoutDocumentLoaderFactoryCID, NS_LAYOUT_DOCUMENT_LOADER_FACTORY_CID);
/* Define Interface IDs */
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID);
static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID);
static NS_DEFINE_IID(kIAppShellServiceIID, NS_IAPPSHELL_SERVICE_IID);
static NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID);
static NS_DEFINE_IID(kIDocumentViewerIID, NS_IDOCUMENT_VIEWER_IID);
static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID);
static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
static NS_DEFINE_IID(kIDOMCharacterDataIID, NS_IDOMCHARACTERDATA_IID);
static NS_DEFINE_IID(kIMenuIID, NS_IMENU_IID);
static NS_DEFINE_IID(kIMenuBarIID, NS_IMENUBAR_IID);
static NS_DEFINE_IID(kIMenuItemIID, NS_IMENUITEM_IID);
static NS_DEFINE_IID(kIContextMenuIID, NS_ICONTEXTMENU_IID);
static NS_DEFINE_IID(kIXULCommandIID, NS_IXULCOMMAND_IID);
static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID);
static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
static NS_DEFINE_IID(kIWindowMediatorIID,NS_IWINDOWMEDIATOR_IID);
static NS_DEFINE_IID(kIXULPopupListenerIID, NS_IXULPOPUPLISTENER_IID);
static NS_DEFINE_CID(kXULPopupListenerCID, NS_XULPOPUPLISTENER_CID);
#ifdef DEBUG_rods
#define DEBUG_MENUSDEL 1
#endif
@ -295,7 +271,7 @@ nsresult nsWebShellWindow::Initialize(nsIWebShellWindow* aParent,
nsRect r(0, 0, aInitialWidth, aInitialHeight);
// Create top level window
rv = nsComponentManager::CreateInstance(kWindowCID, nsnull, kIWidgetIID,
rv = nsComponentManager::CreateInstance(kWindowCID, nsnull, NS_GET_IID(nsIWidget),
(void**)&mWindow);
if (NS_OK != rv) {
return rv;
@ -330,7 +306,7 @@ nsresult nsWebShellWindow::Initialize(nsIWebShellWindow* aParent,
// Create web shell
rv = nsComponentManager::CreateInstance(kWebShellCID, nsnull,
kIWebShellIID,
NS_GET_IID(nsIWebShell),
(void**)&mWebShell);
if (NS_OK != rv) {
return rv;
@ -661,11 +637,11 @@ NS_IMETHODIMP nsWebShellWindow::CreateMenu(nsIMenuBar * aMenuBar,
{
// Create nsMenu
nsIMenu * pnsMenu = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, kIMenuIID, (void**)&pnsMenu);
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create
nsISupports * supports = nsnull;
aMenuBar->QueryInterface(kISupportsIID, (void**) &supports);
aMenuBar->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pnsMenu->Create(supports, aMenuName);
NS_RELEASE(supports);
@ -741,7 +717,7 @@ NS_IMETHODIMP nsWebShellWindow::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, NS_GET_IID(nsIMenuItem), (void**)&pnsMenuItem);
if (NS_OK == rv) {
// Create MenuDelegate - this is the intermediator inbetween
// the DOM node and the nsIMenuItem
@ -811,7 +787,7 @@ NS_IMETHODIMP nsWebShellWindow::LoadMenuItem(
// Make nsMenuItem a child of nsMenu
nsISupports * supports = nsnull;
pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
pnsMenuItem->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pParentMenu->AddItem(supports);
NS_RELEASE(supports);
@ -834,7 +810,7 @@ NS_IMETHODIMP nsWebShellWindow::LoadMenuItem(
}
nsIXULCommand * icmd;
if (NS_OK == menuDelegate->QueryInterface(kIXULCommandIID, (void**) &icmd)) {
if (NS_OK == menuDelegate->QueryInterface(NS_GET_IID(nsIXULCommand), (void**) &icmd)) {
nsCOMPtr<nsIMenuListener> listener(do_QueryInterface(menuDelegate));
if (listener)
@ -872,11 +848,11 @@ void nsWebShellWindow::LoadSubMenu(
// Create nsMenu
nsIMenu * pnsMenu = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, kIMenuIID, (void**)&pnsMenu);
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create
nsISupports * supports = nsnull;
pParentMenu->QueryInterface(kISupportsIID, (void**) &supports);
pParentMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pnsMenu->Create(supports, menuName);
NS_RELEASE(supports); // Balance QI
@ -888,7 +864,7 @@ void nsWebShellWindow::LoadSubMenu(
// Make nsMenu a child of parent nsMenu
//pParentMenu->AddMenu(pnsMenu);
supports = nsnull;
pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
pnsMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pParentMenu->AddItem(supports);
NS_RELEASE(supports);
@ -963,12 +939,12 @@ void nsWebShellWindow::DynamicLoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aP
nsCOMPtr<nsIDOMNode> menubarNode(FindNamedDOMNode(nsAutoString("menubar"), window, endCount, 1));
if (menubarNode) {
nsIMenuBar * pnsMenuBar = nsnull;
rv = nsComponentManager::CreateInstance(kMenuBarCID, nsnull, kIMenuBarIID, (void**)&pnsMenuBar);
rv = nsComponentManager::CreateInstance(kMenuBarCID, nsnull, NS_GET_IID(nsIMenuBar), (void**)&pnsMenuBar);
if (NS_OK == rv) {
if (nsnull != pnsMenuBar) {
// set pnsMenuBar as a nsMenuListener on aParentWindow
nsCOMPtr<nsIMenuListener> menuListener;
pnsMenuBar->QueryInterface(kIMenuListenerIID, getter_AddRefs(menuListener));
pnsMenuBar->QueryInterface(NS_GET_IID(nsIMenuListener), getter_AddRefs(menuListener));
//fake event
nsMenuEvent fake;
@ -1043,14 +1019,14 @@ void nsWebShellWindow::LoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aParentWi
nsCOMPtr<nsIDOMNode> menubarNode(FindNamedDOMNode(nsAutoString("menubar"), window, endCount, 1));
if (menubarNode) {
nsIMenuBar * pnsMenuBar = nsnull;
rv = nsComponentManager::CreateInstance(kMenuBarCID, nsnull, kIMenuBarIID, (void**)&pnsMenuBar);
rv = nsComponentManager::CreateInstance(kMenuBarCID, nsnull, NS_GET_IID(nsIMenuBar), (void**)&pnsMenuBar);
if (NS_OK == rv) {
if (nsnull != pnsMenuBar) {
pnsMenuBar->Create(aParentWindow);
// set pnsMenuBar as a nsMenuListener on aParentWindow
nsCOMPtr<nsIMenuListener> menuListener;
pnsMenuBar->QueryInterface(kIMenuListenerIID, getter_AddRefs(menuListener));
pnsMenuBar->QueryInterface(NS_GET_IID(nsIMenuListener), getter_AddRefs(menuListener));
aParentWindow->AddMenuListener(menuListener);
nsCOMPtr<nsIDOMNode> menuNode;
@ -1107,10 +1083,10 @@ void nsWebShellWindow::DoContextMenu(
{
if (aMenuNode) {
nsIContextMenu * pnsContextMenu;
nsresult rv = nsComponentManager::CreateInstance(kContextMenuCID, nsnull, kIContextMenuIID, (void**)&pnsContextMenu);
nsresult rv = nsComponentManager::CreateInstance(kContextMenuCID, nsnull, NS_GET_IID(nsIContextMenu), (void**)&pnsContextMenu);
if (NS_SUCCEEDED(rv) && pnsContextMenu) {
nsISupports * supports;
aParentWindow->QueryInterface(kISupportsIID, (void**) &supports);
aParentWindow->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pnsContextMenu->Create(supports, aPopupAlignment, aAnchorAlignment);
NS_RELEASE(supports);
pnsContextMenu->SetLocation(aX,aY);
@ -1122,7 +1098,7 @@ void nsWebShellWindow::DoContextMenu(
// Construct and show menu
nsIMenuListener * listener;
pnsContextMenu->QueryInterface(kIMenuListenerIID, (void**) &listener);
pnsContextMenu->QueryInterface(NS_GET_IID(nsIMenuListener), (void**) &listener);
// Dynamically construct and track the menu
listener->MenuSelected(*aMenuEvent);
@ -1300,7 +1276,7 @@ nsWebShellWindow::NewWebShell(PRUint32 aChromeMask, PRBool aVisible,
browser->SetChrome(aChromeMask);
// Spin into the modal loop.
rv = nsComponentManager::CreateInstance(kAppShellCID, nsnull, kIAppShellIID, (void**)&subshell);
rv = nsComponentManager::CreateInstance(kAppShellCID, nsnull, NS_GET_IID(nsIAppShell), (void**)&subshell);
}
if (NS_SUCCEEDED(rv)) {
@ -1442,7 +1418,7 @@ nsWebShellWindow::ShowModalInternal()
nsIAppShell *subshell;
// spin up a new application shell: event loops live there
rv = nsComponentManager::CreateInstance(kAppShellCID, nsnull, kIAppShellIID, (void**)&subshell);
rv = nsComponentManager::CreateInstance(kAppShellCID, nsnull, NS_GET_IID(nsIAppShell), (void**)&subshell);
if (NS_FAILED(rv))
return rv;
@ -2281,7 +2257,7 @@ nsWebShellWindow::AttributeChanged(nsIDocument *aDocument,
//nsCOMPtr<nsIContent> content(do_QueryInterface(node));
// Doing this for the must speed
nsIContent * content;
if (NS_OK == node->QueryInterface(kIContentIID, (void**) &content)) {
if (NS_OK == node->QueryInterface(NS_GET_IID(nsIContent), (void**) &content)) {
if (content == aContent) {
nsAutoString attr;
aAttribute->ToString(attr);

33
mozilla/xpfe/appshell/src/nsWindowMediator.cpp
View File

@ -44,17 +44,12 @@
#include "nsIDocumentViewer.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
static NS_DEFINE_IID(kIRDFDataSourceIID, NS_IRDFDATASOURCE_IID);
static NS_DEFINE_IID(kIRDFServiceIID, NS_IRDFSERVICE_IID);
static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
static NS_DEFINE_IID(kIWindowMediatorIID,NS_IWINDOWMEDIATOR_IID);
static NS_DEFINE_IID(kISimpleEnumberatorIID, NS_ISIMPLEENUMERATOR_IID);
static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID);
static NS_DEFINE_IID( kISimpleEnumerator, NS_ISIMPLEENUMERATOR_IID );
static const char kURINC_WindowMediatorRoot[] = "NC:WindowMediatorRoot";
@ -462,7 +457,7 @@ NS_METHOD nsWindowMediator::GetEnumerator( const PRUnichar* inType, nsISimpleEnu
nsWindowEnumerator* enumerator = new nsWindowEnumerator( inType, *this, PR_FALSE );
if (enumerator )
{
return enumerator->QueryInterface( kISimpleEnumerator , (void**)outEnumerator );
return enumerator->QueryInterface( NS_GET_IID(nsISimpleEnumerator) , (void**)outEnumerator );
}
return NS_ERROR_OUT_OF_MEMORY;
}
@ -475,7 +470,7 @@ NS_METHOD nsWindowMediator::GetXULWindowEnumerator( const PRUnichar* inType, nsI
nsWindowEnumerator* enumerator = new nsWindowEnumerator( inType, *this, PR_TRUE );
if (enumerator )
{
return enumerator->QueryInterface( kISimpleEnumerator , (void**)outEnumerator );
return enumerator->QueryInterface( NS_GET_IID(nsISimpleEnumerator) , (void**)outEnumerator );
}
return NS_ERROR_OUT_OF_MEMORY;
}
@ -643,23 +638,7 @@ NS_IMETHODIMP nsWindowMediator::ConvertISupportsToDOMWindow( nsISupports* inInte
// COM
NS_IMPL_ADDREF( nsWindowMediator );
NS_IMPL_RELEASE( nsWindowMediator );
NS_IMETHODIMP nsWindowMediator::QueryInterface(REFNSIID iid, void **result)
{
if (! result)
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if (iid.Equals(kIRDFDataSourceIID) ||
iid.Equals(kIWindowMediatorIID) ||
iid.Equals(NS_GET_IID(nsISupports)) )
{
*result = NS_STATIC_CAST(nsIWindowMediator *, this);
AddRef();
return NS_OK;
}
return(NS_NOINTERFACE);
}
NS_IMPL_QUERY_INTERFACE2(nsWindowMediator, nsIWindowMediator, nsIRDFDataSource)
// RDF
nsresult
@ -669,7 +648,7 @@ nsWindowMediator::Init()
if (gRefCnt++ == 0)
{
rv = nsServiceManager::GetService( kRDFServiceCID, kIRDFServiceIID, (nsISupports**) &gRDFService );
rv = nsServiceManager::GetService( kRDFServiceCID, NS_GET_IID(nsIRDFService), (nsISupports**) &gRDFService );
if (NS_FAILED(rv)) return rv;
gRDFService->GetResource( kURINC_WindowMediatorRoot, &kNC_WindowMediatorRoot );
@ -679,7 +658,7 @@ nsWindowMediator::Init()
if (NS_FAILED(rv = nsComponentManager::CreateInstance(kRDFInMemoryDataSourceCID,
nsnull,
kIRDFDataSourceIID,
NS_GET_IID(nsIRDFDataSource),
(void**) &mInner)))
{
return rv;
@ -925,5 +904,5 @@ void nsWindowEnumerator::WindowRemoved( PRInt32 inIndex)
*/
NS_IMPL_ADDREF(nsWindowEnumerator);
NS_IMPL_RELEASE(nsWindowEnumerator);
NS_IMPL_QUERY_INTERFACE(nsWindowEnumerator, kISimpleEnumberatorIID);
NS_IMPL_QUERY_INTERFACE1(nsWindowEnumerator, nsISimpleEnumerator);

41
mozilla/xpfe/appshell/src/nsXPConnectFactory.cpp
View File

@ -26,12 +26,6 @@
#include "nsIScriptGlobalObject.h"
#include "nsIDOMXPConnectFactory.h"
// Declare IIDs...
static NS_DEFINE_IID(kIDOMXPConnectFactoryIID, NS_IDOMXPCONNECTFACTORY_IID);
static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
class XPConnectFactoryImpl : public nsIDOMXPConnectFactory,
public nsIScriptObjectOwner
{
@ -72,38 +66,7 @@ XPConnectFactoryImpl::~XPConnectFactoryImpl()
NS_IMPL_ADDREF(XPConnectFactoryImpl)
NS_IMPL_RELEASE(XPConnectFactoryImpl)
NS_IMETHODIMP
XPConnectFactoryImpl::QueryInterface(REFNSIID aIID,void** aInstancePtr)
{
if (aInstancePtr == NULL) {
return NS_ERROR_NULL_POINTER;
}
// Always NULL result, in case of failure
*aInstancePtr = NULL;
if ( aIID.Equals(kIDOMXPConnectFactoryIID) ) {
nsIDOMXPConnectFactory* tmp = this;
*aInstancePtr = tmp;
AddRef();
return NS_OK;
}
else if ( aIID.Equals(kIScriptObjectOwnerIID)) {
nsIScriptObjectOwner* tmp = this;
*aInstancePtr = tmp;
AddRef();
return NS_OK;
}
else if ( aIID.Equals(kISupportsIID) ) {
nsISupports* tmp = (nsIDOMXPConnectFactory*)this;
*aInstancePtr = tmp;
AddRef();
return NS_OK;
}
return NS_NOINTERFACE;
}
NS_IMPL_QUERY_INTERFACE2(XPConnectFactoryImpl, nsIDOMXPConnectFactory, nsIScriptObjectOwner)
// -----
// Implementation of nsIXPConnectFactory interface methods...
@ -127,7 +90,7 @@ XPConnectFactoryImpl::CreateInstance(const nsString &progID, nsISupports**_retva
if (progIdStr) {
rv = nsRepository::CreateInstance(progIdStr,
nsnull, // No Aggregration
kISupportsIID,
NS_GET_IID(nsISupports),
(void**)_retval);
delete [] progIdStr;
} else {

36
mozilla/xpfe/appshell/src/nsXULCommand.cpp
View File

@ -36,14 +36,6 @@
#include "nsXULCommand.h"
#define DEBUG_MENUSDEL 1
//----------------------------------------------------------------------
// Class IID's
// IID's
static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIXULCommandIID, NS_IXULCOMMAND_IID);
//----------------------------------------------------------------------
nsXULCommand::nsXULCommand()
{
@ -62,33 +54,7 @@ NS_IMPL_ADDREF(nsXULCommand)
NS_IMPL_RELEASE(nsXULCommand)
//----------------------------------------------------------------------
nsresult
nsXULCommand::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{
//nsresult rv = NS_NOINTERFACE;
if (NULL == aInstancePtr) {
return NS_ERROR_NULL_POINTER;
}
if (aIID.Equals(kIMenuListenerIID)) {
*aInstancePtr = (void*)(nsIMenuListener*)this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIXULCommandIID)) {
*aInstancePtr = (void*)(nsIXULCommand*)this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kISupportsIID)) {
*aInstancePtr = (void*)(nsISupports*)this;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_ERROR_NO_INTERFACE;
}
NS_IMPL_QUERY_INTERFACE2(nsXULCommand, nsIMenuListener, nsIXULCommand)
//----------------------------------------------------------------------

2
mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
View File

@ -118,7 +118,7 @@ static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
static const char kURINC_BookmarksRoot[] = "NC:BookmarksRoot"; // XXX?
static const char kURINC_IEFavoritesRoot[] = "NC:IEFavoritesRoot"; // XXX?

28
mozilla/xpfe/components/history/src/nsGlobalHistory.cpp
View File

@ -76,8 +76,6 @@ static NS_DEFINE_CID(kGenericFactoryCID, NS_GENERICFACTORY_CID);
static NS_DEFINE_CID(kGlobalHistoryCID, NS_GLOBALHISTORY_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID);
static NS_DEFINE_IID(kIFileLocatorIID, NS_IFILELOCATOR_IID);
#ifdef MOZ_BRPROF
static NS_DEFINE_CID(kBrowsingProfileCID, NS_BROWSINGPROFILE_CID);
@ -547,31 +545,7 @@ NS_NewGlobalHistory(nsISupports* aOuter, REFNSIID aIID, void** aResult)
NS_IMPL_ADDREF(nsGlobalHistory);
NS_IMPL_RELEASE(nsGlobalHistory);
NS_IMETHODIMP
nsGlobalHistory::QueryInterface(REFNSIID aIID, void** aResult)
{
NS_PRECONDITION(aResult != nsnull, "null ptr");
if (! aResult)
return NS_ERROR_NULL_POINTER;
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(nsIGlobalHistory::GetIID()) ||
aIID.Equals(kISupportsIID)) {
*aResult = NS_STATIC_CAST(nsIGlobalHistory*, this);
}
else if (aIID.Equals(nsIRDFDataSource::GetIID())) {
*aResult = NS_STATIC_CAST(nsIRDFDataSource*, this);
}
else {
*aResult = nsnull;
return NS_NOINTERFACE;
}
NS_ADDREF(this);
return NS_OK;
}
NS_IMPL_QUERY_INTERFACE2(nsGlobalHistory, nsIGlobalHistory, nsIRDFDataSource)
//----------------------------------------------------------------------
//

8
mozilla/xpfe/components/prefwindow/src/nsPrefWindow.cpp
View File

@ -64,14 +64,8 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#define WIDGET_IS_TYPE(macro_widget_string,macro_in_string) ((macro_widget_string).Compare((macro_in_string), PR_TRUE) == 0)
// Globals - how many K are we wasting by putting these in every file?
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID);
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_IID(kIFileLocatorIID, NS_IFILELOCATOR_IID);
static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID);
#define CHAR_VAL_BUF_LEN 32

32
mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp
View File

@ -68,7 +68,7 @@ static NS_DEFINE_CID(kRelatedLinksHandlerCID, NS_RELATEDLINKSHANDLER_CID);
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static NS_DEFINE_CID(kGenericFactoryCID, NS_GENERICFACTORY_CID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
static NS_DEFINE_IID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static const char kURINC_RelatedLinksRoot[] = "NC:RelatedLinks";
@ -747,35 +747,7 @@ NS_NewRelatedLinksHandler(nsISupports* aOuter, REFNSIID aIID, void** aResult)
NS_IMPL_ADDREF(RelatedLinksHandlerImpl);
NS_IMPL_RELEASE(RelatedLinksHandlerImpl);
NS_IMETHODIMP
RelatedLinksHandlerImpl::QueryInterface(REFNSIID aIID, void** aResult)
{
NS_PRECONDITION(aResult != nsnull, "null ptr");
if (! aResult)
return NS_ERROR_NULL_POINTER;
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(NS_GET_IID(nsIRelatedLinksHandler)) ||
aIID.Equals(kISupportsIID))
{
*aResult = NS_STATIC_CAST(nsIRelatedLinksHandler*, this);
}
else if (aIID.Equals(NS_GET_IID(nsIRDFDataSource))) {
*aResult = NS_STATIC_CAST(nsIRDFDataSource*, this);
}
else
{
*aResult = nsnull;
return NS_NOINTERFACE;
}
// If we get here, we know the QI succeeded
NS_ADDREF(this);
return NS_OK;
}
NS_IMPL_QUERY_INTERFACE2(RelatedLinksHandlerImpl, nsIRelatedLinksHandler, nsIRDFDataSource)

1
mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
View File

@ -86,7 +86,6 @@
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID);
static const char kURINC_SearchEngineRoot[] = "NC:SearchEngineRoot";

1
mozilla/xpfe/components/search/src/nsLocalSearchService.cpp
View File

@ -51,7 +51,6 @@
#include "nsISearchService.h"
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID);

8
mozilla/xpfe/components/startup/src/nsCommandLineService.cpp
View File

@ -30,11 +30,7 @@
/* Define Class IDs */
static NS_DEFINE_IID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
/* Define Interface IDs */
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
class nsCmdLineService : public nsICmdLineService
@ -323,7 +319,7 @@ nsCmdLineServiceFactory::~nsCmdLineServiceFactory()
{
}
NS_IMPL_ISUPPORTS(nsCmdLineServiceFactory, kIFactoryIID);
NS_IMPL_ISUPPORTS1(nsCmdLineServiceFactory, nsIFactory);
nsresult

2
mozilla/xpfe/components/xfer/src/nsStreamXferOp.cpp
View File

@ -155,7 +155,7 @@ nsStreamXferOp::Start( void ) {
if ( mInputChannel ) {
if ( !mOutputChannel ) {
// First, get file transport service.
NS_DEFINE_IID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
NS_WITH_SERVICE( nsIFileTransportService, fts, kFileTransportServiceCID, &rv );
if ( NS_SUCCEEDED( rv ) ) {

2
mozilla/xpfe/main/main.cpp
View File

@ -26,7 +26,7 @@
#include "nsIAppRunner.h" // For nsIAppRunner.
// Define Class IDs.
static NS_DEFINE_IID(kAppRunnerCID, NS_APPRUNNER_CID);
static NS_DEFINE_CID(kAppRunnerCID, NS_APPRUNNER_CID);
// Define Interface IDs.
static NS_DEFINE_IID(kIAppRunnerIID, NS_IAPPRUNNER_IID);