From cb47c405275774e9346ffd4fea1be532b34678f6 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Tue, 7 Feb 2006 01:12:47 +0000 Subject: [PATCH] Replace uses of deprecated NS_IMPL_ISUPPORTS and NS_IMPL_QUERYINTERFACE macros with NS_IMPL_{ISUPPORTS,QUERYINTERFACE}{1,0}. r=jag rs=brendan b=45797 --- widget/src/gtk2/nsDeviceContextSpecFactoryG.cpp | 7 ++----- widget/src/gtk2/nsDeviceContextSpecG.cpp | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/widget/src/gtk2/nsDeviceContextSpecFactoryG.cpp b/widget/src/gtk2/nsDeviceContextSpecFactoryG.cpp index 47ededb4f992..9202d85acbf0 100644 --- a/widget/src/gtk2/nsDeviceContextSpecFactoryG.cpp +++ b/widget/src/gtk2/nsDeviceContextSpecFactoryG.cpp @@ -42,13 +42,10 @@ nsDeviceContextSpecFactoryGTK :: ~nsDeviceContextSpecFactoryGTK() { } -static NS_DEFINE_IID(kDeviceContextSpecFactoryIID, NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID); static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID); -static NS_DEFINE_IID(kDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID); +static NS_DEFINE_CID(kDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID); -NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecFactoryGTK, kDeviceContextSpecFactoryIID) -NS_IMPL_ADDREF(nsDeviceContextSpecFactoryGTK) -NS_IMPL_RELEASE(nsDeviceContextSpecFactoryGTK) +NS_IMPL_ISUPPORTS1(nsDeviceContextSpecFactoryGTK, nsIDeviceContextSpecFactory) /** ------------------------------------------------------- * Initialize the device context spec factory diff --git a/widget/src/gtk2/nsDeviceContextSpecG.cpp b/widget/src/gtk2/nsDeviceContextSpecG.cpp index 3d2b401fa4fa..4e7e9dffceb9 100644 --- a/widget/src/gtk2/nsDeviceContextSpecG.cpp +++ b/widget/src/gtk2/nsDeviceContextSpecG.cpp @@ -64,9 +64,7 @@ static NS_DEFINE_IID(kIDeviceContextSpecXPIID, NS_IDEVICE_CONTEXT_SPEC_XP_IID); #endif #if 0 -NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecGTK, kDeviceContextSpecIID) -NS_IMPL_ADDREF(nsDeviceContextSpecGTK) -NS_IMPL_RELEASE(nsDeviceContextSpecGTK) +NS_IMPL_ISUPPORTS1(nsDeviceContextSpecGTK, nsIDeviceContextSpec) #endif NS_IMETHODIMP nsDeviceContextSpecGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)