Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 945587 - Stop using the kRDFServiceCID name in content/xul; r=bzbarsky

Browse Source 
--HG--
extra : rebase_source : 08aeb4bfce11e6d26cf034858f72b2526b15d60e
This commit is contained in:
Ehsan Akhgari 2013-12-03 14:34:18 -05:00
parent 968c534750
commit 0afee744b6
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/xul/templates/src/nsXULContentUtils.cpp
View File

@ -61,8 +61,6 @@
using namespace mozilla;
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
//------------------------------------------------------------------------
nsIRDFService* nsXULContentUtils::gRDF;
@ -86,7 +84,7 @@ extern PRLogModuleInfo* gXULTemplateLog;
nsresult
nsXULContentUtils::Init()
{
nsresult rv = CallGetService(kRDFServiceCID, &gRDF);
nsresult rv = CallGetService(NS_RDFSERVICE_CID, &gRDF);
if (NS_FAILED(rv)) {
return rv;
}

3
content/xul/templates/src/nsXULTemplateBuilder.cpp
View File

@ -142,8 +142,7 @@ nsXULTemplateBuilder::InitGlobals()
if (gRefCnt++ == 0) {
// Initialize the global shared reference to the service
// manager and get some shared resource objects.
NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
rv = CallGetService(kRDFServiceCID, &gRDFService);
rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
if (NS_FAILED(rv))
return rv;

3
content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
View File

@ -142,8 +142,7 @@ nsXULTemplateQueryProcessorRDF::InitGlobals()
// Initialize the global shared reference to the service
// manager and get some shared resource objects.
if (!gRDFService) {
NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
rv = CallGetService(kRDFServiceCID, &gRDFService);
rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
if (NS_FAILED(rv))
return rv;
}

4
content/xul/templates/src/nsXULTemplateResultStorage.cpp
View File

@ -9,13 +9,11 @@
#include "nsString.h"
#include "nsXULTemplateResultStorage.h"
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
NS_IMPL_ISUPPORTS1(nsXULTemplateResultStorage, nsIXULTemplateResult)
nsXULTemplateResultStorage::nsXULTemplateResultStorage(nsXULTemplateResultSetStorage* aResultSet)
{
nsCOMPtr<nsIRDFService> rdfService = do_GetService(kRDFServiceCID);
nsCOMPtr<nsIRDFService> rdfService = do_GetService(NS_RDFSERVICE_CID);
rdfService->GetAnonymousResource(getter_AddRefs(mNode));
mResultSet = aResultSet;
if (aResultSet) {