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

Bug 337917 Make consumers stop using cids from other modules

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@200245 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2006-06-18 21:18:22 +00:00
parent 83e679f6b5
commit d7d1bbda1f
42 changed files with 68 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/parser/htmlparser/robot/nsDebugRobot.cpp
View File

@@ -56,8 +56,6 @@
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
class RobotSinkObserver : public nsIRobotSinkObserver {
public:
RobotSinkObserver() {
@@ -253,7 +251,7 @@ extern "C" NS_EXPORT int DebugRobot(
// Create url
nsIURI* url;
nsresult rv;
nsCOMPtr<nsIIOService> service(do_GetService(kIOServiceCID, &rv));
nsCOMPtr<nsIIOService> service(do_GetService(NS_IOSERVICE_CONTRACTID, &rv));
if (NS_FAILED(rv)) return rv;
nsIURI *uri = nsnull;

3
mozilla/parser/htmlparser/robot/nsRobotSink.cpp
View File

@@ -59,7 +59,6 @@ class nsIDocument;
// - IMG SRC
// - LAYER SRC
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID);
static NS_DEFINE_IID(kIRobotSinkIID, NS_IROBOTSINK_IID);
@@ -289,7 +288,7 @@ void RobotSink::ProcessLink(const nsString& aLink)
if (nsnull != docURL) {
nsIURI* absurl;
nsresult rv;
nsCOMPtr<nsIIOService> service(do_GetService(kIOServiceCID, &rv));
nsCOMPtr<nsIIOService> service(do_GetService(NS_IOSERVICE_CONTRACTID, &rv));
if (NS_FAILED(rv)) return;
nsIURI *uri = nsnull, *baseUri = nsnull;

3
mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp
View File

@@ -46,7 +46,6 @@
#include "nsIIOService.h"
#include "nsIChannel.h"
#include "nsILocalFile.h"
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#include "nsStringAPI.h"
#include "nsCRT.h"
@@ -237,7 +236,7 @@ PageGrabber::Grab(const nsCString& aURL)
// Create the URL object...
nsCOMPtr<nsIURI> url;
nsCOMPtr<nsIIOService> ioService(do_GetService(kIOServiceCID, &rv));
nsCOMPtr<nsIIOService> ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv));
if (NS_FAILED(rv)) return rv;
rv = ioService->NewURI(aURL, nsnull, nsnull, getter_AddRefs(url));

3
mozilla/parser/htmlparser/tests/logparse/logparse.cpp
View File

@@ -50,7 +50,6 @@
// Class IID's
static NS_DEFINE_CID(kParserCID, NS_PARSER_CID);
static NS_DEFINE_IID(kLoggingSinkCID, NS_LOGGING_SINK_CID);
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
// Interface IID's
@@ -86,7 +85,7 @@ nsresult GenerateBaselineFile(const char* aSourceFilename,const char* aBaselineF
localfile->InitWithNativePath(nsDependentCString(aSourceFilename));
nsCOMPtr<nsIURI> inputURI;
{
nsCOMPtr<nsIIOService> ioService(do_GetService(kIOServiceCID, &rv));
nsCOMPtr<nsIIOService> ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv));
if (NS_FAILED(rv))
return rv;
rv = ioService->NewFileURI(localfile, getter_AddRefs(inputURI));