From e988595605e10a958b4328b068cf3943ee717db9 Mon Sep 17 00:00:00 2001
From: "dbaron%fas.harvard.edu"
 <dbaron%fas.harvard.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 12 Jan 2002 03:14:03 +0000
Subject: [PATCH] Clean up QueryInterface implementation.  Patch by Roland
 Mainz <Roland.Mainz@informatik.med.uni-giessen.de>.  r=dbaron  sr=sfraser 
 b=111088

git-svn-id: svn://10.0.0.236/trunk@112012 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp | 60 +++-----------------
 1 file changed, 8 insertions(+), 52 deletions(-)

diff --git a/mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp b/mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp
index 06725a391ff..562f4fedb4b 100644
--- a/mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp
+++ b/mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp
@@ -106,61 +106,17 @@ nsDeviceContextSpecGTK :: ~nsDeviceContextSpecGTK()
 {
 }
 
-static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
-static NS_DEFINE_IID(kIDeviceContextSpecPSIID, NS_IDEVICE_CONTEXT_SPEC_PS_IID);
 #ifdef USE_XPRINT
-static NS_DEFINE_IID(kIDeviceContextSpecXPIID, NS_IDEVICE_CONTEXT_SPEC_XP_IID);
-#endif
-
-NS_IMETHODIMP nsDeviceContextSpecGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (nsnull == aInstancePtr)
-    return NS_ERROR_NULL_POINTER;
-
-  if (aIID.Equals(kIDeviceContextSpecIID))
-  {
-    nsIDeviceContextSpec* tmp = this;
-    *aInstancePtr = (void*) tmp;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  if (aIID.Equals(kIDeviceContextSpecPSIID))
-  {
-    nsIDeviceContextSpecPS* tmp = this;
-    *aInstancePtr = (void*) tmp;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-#ifdef USE_XPRINT
-  if (aIID.Equals(kIDeviceContextSpecXPIID))
-  {
-    nsIDeviceContextSpecXp *tmp = this;
-    *aInstancePtr = (void*) tmp;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
+NS_IMPL_ISUPPORTS3(nsDeviceContextSpecGTK,
+                   nsIDeviceContextSpec,
+                   nsIDeviceContextSpecPS,
+                   nsIDeviceContextSpecXp)
+#else
+NS_IMPL_ISUPPORTS2(nsDeviceContextSpecGTK,
+                   nsIDeviceContextSpec,
+                   nsIDeviceContextSpecPS)
 #endif /* USE_XPRINT */
 
-  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-  if (aIID.Equals(kISupportsIID))
-  {
-    nsIDeviceContextSpec* tmp = this;
-    nsISupports* tmp2 = tmp;
-    *aInstancePtr = (void*) tmp2;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsDeviceContextSpecGTK)
-NS_IMPL_RELEASE(nsDeviceContextSpecGTK)
-
-
 static nsresult DisplayXPDialog(nsIPrintSettings* aPS,
                                 const char* aChromeURL, 
                                 PRBool& aClickedOK)