Bug 86734: Remove NS_WITH_SERVICE. r=dbaron, rs=scc, a=asa

git-svn-id: svn://10.0.0.236/trunk@99906 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com
2001-07-25 07:54:28 +00:00
parent 5457c9aeca
commit 2b3b3b2586
477 changed files with 1976 additions and 1454 deletions

View File

@@ -33,10 +33,12 @@
// Now you can replace this:
// {
// nsresult rv;
// NS_WITH_SERVICE(nsIMyService, pIMyService, kMyServiceCID, &rv);
// nsCOMPtr<nsIMyService> pIMyService =
// do_GetService(kMyServiceCID, &rv);
// if(NS_FAILED(rv))
// return;
// NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, kProxyObjectManagerCID, &rv);
// nsCOMPtr<nsIProxyObjectManager> pIProxyObjectManager =
// do_GetService(kProxyObjectManagerCID, &rv);
// if(NS_FAILED(rv))
// return;
// nsIMyService pIProxiedObject = NULL;
@@ -90,8 +92,8 @@ class nsProxiedService
getter_AddRefs(mService));
if (NS_FAILED(*rv)) return;
NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager,
kProxyObjectManagerCID, rv);
nsCOMPtr<nsIProxyObjectManager> pIProxyObjectManager =
do_GetService(kProxyObjectManagerCID, rv);
if (NS_FAILED(*rv)) return;
PRInt32 proxyType = PROXY_SYNC;

View File

@@ -182,7 +182,8 @@ nsProxyObjectManager::GetProxyForObject(nsIEventQueue *destQueue,
// check to see if the destination Q is a special case.
NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
nsCOMPtr<nsIEventQueueService> eventQService =
do_GetService(kEventQueueServiceCID, &rv);
if (NS_FAILED(rv))
return rv;

View File

@@ -294,7 +294,8 @@ void TestCase_NestedLoop(void *arg)
printf("Getting EventQueue...\n");
nsIEventQueue* eventQ;
NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
nsCOMPtr<nsIEventQueueService> eventQService =
do_GetService(kEventQueueServiceCID, &rv);
if (NS_SUCCEEDED(rv))
{
rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &eventQ);
@@ -413,7 +414,8 @@ static void PR_CALLBACK EventLoop( void *arg )
printf("Creating EventQueue...\n");
nsIEventQueue* eventQ;
NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
nsCOMPtr<nsIEventQueueService> eventQService =
do_GetService(kEventQueueServiceCID, &rv);
if (NS_SUCCEEDED(rv)) {
rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &eventQ);
if (NS_FAILED(rv))