From afea99f4a0dc8b7fa250feb3ffebf9c14748e8d5 Mon Sep 17 00:00:00 2001 From: "mccabe%netscape.com" Date: Sun, 22 Aug 1999 23:52:07 +0000 Subject: [PATCH] Replace declarations of interface methods in implementation classes with xpidl-generated NS_DECL_NSIFOO. Remainder of the netwerk portion of the NS_DECL_NSIFOO spam. git-svn-id: svn://10.0.0.236/trunk@44096 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/chrome/src/nsChromeProtocolHandler.h | 10 +--- mozilla/docshell/base/nsWebShell.cpp | 9 +-- mozilla/dom/src/jsurl/nsJSProtocolHandler.h | 10 +--- mozilla/mailnews/base/util/nsMsgMailNewsUrl.h | 52 +---------------- mozilla/mailnews/compose/src/nsSmtpService.h | 7 +-- mozilla/mailnews/imap/src/nsImapService.h | 7 +-- mozilla/mailnews/local/src/nsMailboxService.h | 7 +-- mozilla/mailnews/local/src/nsPop3Service.h | 7 +-- mozilla/mailnews/mime/src/nsStreamConverter.h | 3 +- mozilla/mailnews/news/src/nsNntpService.h | 6 +- .../plugin/base/src/nsPluginHostImpl.cpp | 14 ++--- .../plugin/nglsrc/nsPluginHostImpl.cpp | 14 ++--- mozilla/netwerk/base/src/nsIOService.h | 28 +-------- mozilla/netwerk/base/src/nsNetModuleMgr.h | 4 +- mozilla/netwerk/base/src/nsStdURL.h | 58 +------------------ mozilla/netwerk/dns/src/nsDnsService.h | 5 +- mozilla/netwerk/mime/src/nsMIMEInfoImpl.h | 11 +--- mozilla/netwerk/mime/src/nsMIMEService.h | 8 +-- .../netwerk/protocol/about/src/nsAboutBlank.h | 5 +- .../about/src/nsAboutProtocolHandler.h | 10 +--- .../protocol/file/src/nsFileProtocolHandler.h | 13 +---- .../protocol/ftp/src/nsFtpProtocolHandler.h | 10 +--- .../netwerk/protocol/http/src/nsHTTPHandler.h | 7 +-- .../protocol/http/src/nsHTTPHeaderArray.h | 3 +- .../resource/src/nsResourceProtocolHandler.h | 10 +--- .../streamconv/src/nsStreamConverterService.h | 3 +- .../rdf/chrome/src/nsChromeProtocolHandler.h | 10 +--- mozilla/uriloader/exthandler/nsMIMEInfoImpl.h | 11 +--- mozilla/webshell/src/nsWebShell.cpp | 9 +-- .../webshell/tests/viewer/nsBrowserWindow.h | 8 +-- .../xpfe/appshell/src/nsNetSupportDialog.h | 9 +-- mozilla/xpfe/appshell/src/nsWebShellWindow.h | 11 +--- 32 files changed, 46 insertions(+), 333 deletions(-) diff --git a/mozilla/chrome/src/nsChromeProtocolHandler.h b/mozilla/chrome/src/nsChromeProtocolHandler.h index e79061a89f4..15c1f136cf3 100644 --- a/mozilla/chrome/src/nsChromeProtocolHandler.h +++ b/mozilla/chrome/src/nsChromeProtocolHandler.h @@ -35,15 +35,7 @@ public: NS_DECL_ISUPPORTS // nsIProtocolHandler methods: - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, - char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, - nsIURI **_retval); - NS_IMETHOD NewChannel(const char* verb, nsIURI* url, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **_retval); + NS_DECL_NSIPROTOCOLHANDLER // nsChromeProtocolHandler methods: nsChromeProtocolHandler(); diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 12c0d323931..190835d2aba 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -379,14 +379,7 @@ public: #ifdef NECKO // nsIPrompt - NS_IMETHOD Alert(const PRUnichar *text); - NS_IMETHOD Confirm(const PRUnichar *text, PRBool *_retval); - NS_IMETHOD ConfirmCheck(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); - NS_IMETHOD ConfirmYN(const PRUnichar *text, PRBool *_retval); - NS_IMETHOD ConfirmCheckYN(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); - NS_IMETHOD Prompt(const PRUnichar *text, const PRUnichar *defaultText, PRUnichar **result, PRBool *_retval); - NS_IMETHOD PromptUsernameAndPassword(const PRUnichar *text, PRUnichar **user, PRUnichar **pwd, PRBool *_retval); - NS_IMETHOD PromptPassword(const PRUnichar *text, PRUnichar **pwd, PRBool *_retval); + NS_DECL_NSIPROMPT #else // nsINetSupport interface methods NS_IMETHOD_(void) Alert(const nsString &aText); diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.h b/mozilla/dom/src/jsurl/nsJSProtocolHandler.h index f914378dd52..758d37f6596 100644 --- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.h +++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.h @@ -35,15 +35,7 @@ public: NS_DECL_ISUPPORTS // nsIProtocolHandler methods: - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, - char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, - nsIURI **_retval); - NS_IMETHOD NewChannel(const char* verb, nsIURI* url, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **_retval); + NS_DECL_NSIPROTOCOLHANDLER // nsJSProtocolHandler methods: nsJSProtocolHandler(); diff --git a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.h b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.h index e5e57ecb543..7856463608d 100644 --- a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.h +++ b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.h @@ -76,59 +76,11 @@ public: ////////////////////////////////////////////////////////////////////////////////// // nsIURI support - NS_IMETHOD GetSpec(char * *aSpec); - NS_IMETHOD SetSpec(char * aSpec); - - /* attribute string Scheme; */ - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD SetScheme(char * aScheme); - - /* attribute string PreHost; */ - NS_IMETHOD GetPreHost(char * *aPreHost); - NS_IMETHOD SetPreHost(char * aPreHost); - - /* attribute string Host; */ - NS_IMETHOD GetHost(char * *aHost); - NS_IMETHOD SetHost(char * aHost); - - /* attribute long Port; */ - NS_IMETHOD GetPort(PRInt32 *aPort); - NS_IMETHOD SetPort(PRInt32 aPort); - - /* attribute string Path; */ - NS_IMETHOD GetPath(char * *aPath); - NS_IMETHOD SetPath(char * aPath); - - /* boolean Equals (in nsIURI other); */ - NS_IMETHOD Equals(nsIURI *other, PRBool *_retval); - - /* nsIURI Clone (); */ - NS_IMETHOD Clone(nsIURI **_retval); - - NS_IMETHOD SetRelativePath(const char *i_RelativePath); + NS_DECL_NSIURI ////////////////////////////////////////////////////////////////////////////////// // nsIURL support - NS_IMETHOD GetDirectory(char * *aDirectory); - NS_IMETHOD SetDirectory(char * aDirectory); - - /* attribute string FileName; */ - NS_IMETHOD GetFileName(char * *aFileName); - NS_IMETHOD SetFileName(char * aFileName); - - /* attribute string Param; */ - NS_IMETHOD GetParam(char * *aParam); - NS_IMETHOD SetParam(char * aParam); - - /* attribute string Query; */ - NS_IMETHOD GetQuery(char * *aQuery); - NS_IMETHOD SetQuery(char * aQuery); - - /* attribute string Ref; */ - NS_IMETHOD GetRef(char * *aRef); - NS_IMETHOD SetRef(char * aRef); - - NS_IMETHOD DirFile(char **o_DirFile); + NS_DECL_NSIURL protected: virtual ~nsMsgMailNewsUrl(); diff --git a/mozilla/mailnews/compose/src/nsSmtpService.h b/mozilla/mailnews/compose/src/nsSmtpService.h index f00a0da1a58..ac21fd64a22 100644 --- a/mozilla/mailnews/compose/src/nsSmtpService.h +++ b/mozilla/mailnews/compose/src/nsSmtpService.h @@ -73,12 +73,7 @@ public: ////////////////////////////////////////////////////////////////////////// // we suppport the nsIProtocolHandler interface ////////////////////////////////////////////////////////////////////////// - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); - + NS_DECL_NSIPROTOCOLHANDLER ////////////////////////////////////////////////////////////////////////// // End support of nsIProtocolHandler interface ////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/mailnews/imap/src/nsImapService.h b/mozilla/mailnews/imap/src/nsImapService.h index ae228e2e633..e6a5a10c849 100644 --- a/mozilla/mailnews/imap/src/nsImapService.h +++ b/mozilla/mailnews/imap/src/nsImapService.h @@ -187,12 +187,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// // we suppport the nsIProtocolHandler interface //////////////////////////////////////////////////////////////////////////////////////// - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); - + NS_DECL_NSIPROTOCOLHANDLER //////////////////////////////////////////////////////////////////////////////////////// // End support of nsIProtocolHandler interface //////////////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/mailnews/local/src/nsMailboxService.h b/mozilla/mailnews/local/src/nsMailboxService.h index fb1ea69164b..ea57fecb940 100644 --- a/mozilla/mailnews/local/src/nsMailboxService.h +++ b/mozilla/mailnews/local/src/nsMailboxService.h @@ -74,12 +74,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// // we suppport the nsIProtocolHandler Interface //////////////////////////////////////////////////////////////////////////////////////// - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); - + NS_DECL_NSIPROTOCOLHANDLER //////////////////////////////////////////////////////////////////////////////////////// // End support of nsIProtocolHandler interface //////////////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/mailnews/local/src/nsPop3Service.h b/mozilla/mailnews/local/src/nsPop3Service.h index fbd075e318d..fe7f4d00dbc 100644 --- a/mozilla/mailnews/local/src/nsPop3Service.h +++ b/mozilla/mailnews/local/src/nsPop3Service.h @@ -57,12 +57,7 @@ public: /////////////////////////////////////////////////////////////////////////////////////// // we suppport the nsIProtocolHandler interface //////////////////////////////////////////////////////////////////////////////////////// - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); - + NS_DECL_NSIPROTOCOLHANDLER //////////////////////////////////////////////////////////////////////////////////////// // End support of nsIProtocolHandler interface //////////////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/mailnews/mime/src/nsStreamConverter.h b/mozilla/mailnews/mime/src/nsStreamConverter.h index c40125ce835..d129d530ba1 100644 --- a/mozilla/mailnews/mime/src/nsStreamConverter.h +++ b/mozilla/mailnews/mime/src/nsStreamConverter.h @@ -40,8 +40,7 @@ public: NS_DECL_ISUPPORTS // nsIStreamConverter - NS_IMETHOD Init(nsIURI *aURI, nsIStreamListener *outListener, nsIChannel * aChannel); - NS_IMETHOD GetContentType(char **aOutputContentType); + NS_DECL_NSISTREAMCONVERTER2 // nsIMimeStreamConverter support NS_IMETHOD SetMimeOutputType(nsMimeOutputType aType); diff --git a/mozilla/mailnews/news/src/nsNntpService.h b/mozilla/mailnews/news/src/nsNntpService.h index 3fffa787f6b..bec2b630b37 100644 --- a/mozilla/mailnews/news/src/nsNntpService.h +++ b/mozilla/mailnews/news/src/nsNntpService.h @@ -61,11 +61,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////// // we suppport the nsIProtocolHandler Interface //////////////////////////////////////////////////////////////////////////////////////// - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **_retval); - NS_IMETHOD NewChannel(const char *verb, nsIURI *aURI, nsIEventSinkGetter *eventSinkGetter, nsIChannel **_retval); + NS_DECL_NSIPROTOCOLHANDLER // nsNntpService nsNntpService(); diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index cb74315362c..169d79fb7e6 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -394,17 +394,13 @@ public: #ifdef NECKO // nsIProgressEventSink methods: - NS_IMETHOD OnProgress(nsIChannel* channel, nsISupports* context, - PRUint32 Progress, PRUint32 ProgressMax); - NS_IMETHOD OnStatus(nsIChannel* channel, nsISupports* context, - const PRUnichar* aMmsg); + NS_DECL_NSIPROGRESSEVENTSINK + // nsIStreamObserver methods: - NS_IMETHOD OnStartRequest(nsIChannel* channel, nsISupports *ctxt); - NS_IMETHOD OnStopRequest(nsIChannel* channel, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg); + NS_DECL_NSISTREAMOBSERVER + // nsIStreamListener methods: - NS_IMETHOD OnDataAvailable(nsIChannel* channel, nsISupports *ctxt, - nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); + NS_DECL_NSISTREAMLISTENER #else //nsIStreamObserver interface diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index cb74315362c..169d79fb7e6 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -394,17 +394,13 @@ public: #ifdef NECKO // nsIProgressEventSink methods: - NS_IMETHOD OnProgress(nsIChannel* channel, nsISupports* context, - PRUint32 Progress, PRUint32 ProgressMax); - NS_IMETHOD OnStatus(nsIChannel* channel, nsISupports* context, - const PRUnichar* aMmsg); + NS_DECL_NSIPROGRESSEVENTSINK + // nsIStreamObserver methods: - NS_IMETHOD OnStartRequest(nsIChannel* channel, nsISupports *ctxt); - NS_IMETHOD OnStopRequest(nsIChannel* channel, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg); + NS_DECL_NSISTREAMOBSERVER + // nsIStreamListener methods: - NS_IMETHOD OnDataAvailable(nsIChannel* channel, nsISupports *ctxt, - nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count); + NS_DECL_NSISTREAMLISTENER #else //nsIStreamObserver interface diff --git a/mozilla/netwerk/base/src/nsIOService.h b/mozilla/netwerk/base/src/nsIOService.h index b32d97a866b..12a7b88415e 100644 --- a/mozilla/netwerk/base/src/nsIOService.h +++ b/mozilla/netwerk/base/src/nsIOService.h @@ -28,33 +28,7 @@ public: NS_DECL_ISUPPORTS // nsIIOService methods: - NS_IMETHOD GetProtocolHandler(const char *scheme, - nsIProtocolHandler **_retval); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, - nsIURI *aBaseURI, - char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, - nsIURI **_retval); - NS_IMETHOD NewChannelFromURI(const char* verb, nsIURI *aURI, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **_retval); - NS_IMETHOD NewChannel(const char* verb, const char *aSpec, - nsIURI *aBaseURI, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **_retval); - NS_IMETHOD GetAppCodeName(PRUnichar* *aAppCodeName); - NS_IMETHOD GetAppVersion(PRUnichar* *aAppVersion); - NS_IMETHOD GetAppName(PRUnichar* *aAppName); - NS_IMETHOD GetLanguage(PRUnichar* *aLanguage); - NS_IMETHOD SetLanguage(PRUnichar* aLanguage); - NS_IMETHOD GetPlatform(PRUnichar* *aPlatform); - NS_IMETHOD GetUserAgent(PRUnichar* *aUserAgent); - NS_IMETHOD NewAsyncStreamObserver(nsIStreamObserver *receiver, nsIEventQueue *eventQueue, nsIStreamObserver **_retval); - NS_IMETHOD NewAsyncStreamListener(nsIStreamListener *receiver, nsIEventQueue *eventQueue, nsIStreamListener **_retval); - NS_IMETHOD NewSyncStreamListener(nsIInputStream **inStream, nsIBufferOutputStream **outStream, nsIStreamListener **_retval); - NS_IMETHOD NewChannelFromNativePath(const char *nativePath, nsIFileChannel **_retval); - NS_IMETHOD NewLoadGroup(nsISupports* outer, nsIStreamObserver* observer, nsILoadGroup* parent, nsILoadGroup **result); - NS_IMETHOD NewInputStreamChannel(nsIURI* uri, const char *contentType, nsIInputStream *inStr, nsIChannel **result); + NS_DECL_NSIIOSERVICE // nsIOService methods: nsIOService(); diff --git a/mozilla/netwerk/base/src/nsNetModuleMgr.h b/mozilla/netwerk/base/src/nsNetModuleMgr.h index ec12d0f1a90..5fc012f69f4 100644 --- a/mozilla/netwerk/base/src/nsNetModuleMgr.h +++ b/mozilla/netwerk/base/src/nsNetModuleMgr.h @@ -30,9 +30,7 @@ public: NS_DECL_ISUPPORTS // nsINetModuleMgr - NS_IMETHOD RegisterModule(const char *aTopic, nsIEventQueue *aEventQueue, nsINetNotify *aNotify, const nsCID * aCID); - NS_IMETHOD UnregisterModule(const char *aTopic, nsIEventQueue *aEventQueue, nsINetNotify *aNotify, const nsCID * aCID); - NS_IMETHOD EnumerateModules(const char *aTopic, nsISimpleEnumerator **aEnumerator); + NS_DECL_NSINETMODULEMGR // nsNetModuleMgr nsNetModuleMgr(); diff --git a/mozilla/netwerk/base/src/nsStdURL.h b/mozilla/netwerk/base/src/nsStdURL.h index 1cd01578667..53b3d66a1d4 100644 --- a/mozilla/netwerk/base/src/nsStdURL.h +++ b/mozilla/netwerk/base/src/nsStdURL.h @@ -52,65 +52,11 @@ public: //////////////////////////////////////////////////////////////////////////// // nsIURI methods: - - /* attribute string Spec; */ - NS_IMETHOD GetSpec(char * *aSpec); - NS_IMETHOD SetSpec(char * aSpec); - - /* attribute string Scheme; */ - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD SetScheme(char * aScheme); - - /* attribute string PreHost; */ - NS_IMETHOD GetPreHost(char * *aPreHost); - NS_IMETHOD SetPreHost(char * aPreHost); - - /* attribute string Host; */ - NS_IMETHOD GetHost(char * *aHost); - NS_IMETHOD SetHost(char * aHost); - - /* attribute long Port; */ - NS_IMETHOD GetPort(PRInt32 *aPort); - NS_IMETHOD SetPort(PRInt32 aPort); - - /* attribute string Path; */ - NS_IMETHOD GetPath(char * *aPath); - NS_IMETHOD SetPath(char * aPath); - - /* boolean Equals (in nsIURI other); */ - NS_IMETHOD Equals(nsIURI *other, PRBool *_retval); - - /* nsIURI Clone (); */ - NS_IMETHOD Clone(nsIURI **_retval); - - /* void SetRelativePath (in string i_RelativePath); */ - NS_IMETHOD SetRelativePath(const char *i_RelativePath); + NS_DECL_NSIURI //////////////////////////////////////////////////////////////////////////// // nsIURL methods: - - /* attribute string Directory; */ - NS_IMETHOD GetDirectory(char * *aDirectory); - NS_IMETHOD SetDirectory(char * aDirectory); - - /* attribute string FileName; */ - NS_IMETHOD GetFileName(char * *aFileName); - NS_IMETHOD SetFileName(char * aFileName); - - /* attribute string Param; */ - NS_IMETHOD GetParam(char * *aParam); - NS_IMETHOD SetParam(char * aParam); - - /* attribute string Query; */ - NS_IMETHOD GetQuery(char * *aQuery); - NS_IMETHOD SetQuery(char * aQuery); - - /* attribute string Ref; */ - NS_IMETHOD GetRef(char * *aRef); - NS_IMETHOD SetRef(char * aRef); - - /* void DirFile (out string o_DirFile); */ - NS_IMETHOD DirFile(char **o_DirFile); + NS_DECL_NSIURL /* todo move this to protected later */ nsresult ParsePath(void); diff --git a/mozilla/netwerk/dns/src/nsDnsService.h b/mozilla/netwerk/dns/src/nsDnsService.h index 27011b5258d..0b014ee50fe 100644 --- a/mozilla/netwerk/dns/src/nsDnsService.h +++ b/mozilla/netwerk/dns/src/nsDnsService.h @@ -45,10 +45,7 @@ public: Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult); // nsIDNSService methods: - NS_IMETHOD Lookup(nsISupports *ctxt, - const char *hostname, - nsIDNSListener *listener, - nsIRequest **result); + NS_DECL_NSIDNSSERVICE protected: // nsDNSLookup cache? - list of nsDNSLookups diff --git a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.h b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.h index d64b3e0ae22..9f0ae406d59 100644 --- a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.h +++ b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.h @@ -34,16 +34,7 @@ class nsMIMEInfoImpl : public nsIMIMEInfo { PRBool InExtensions(nsIAtom* anIAtom); // nsIMIMEInfo methods - NS_IMETHOD GetFileExtensions(char * *aFileExtensions); - NS_IMETHOD SetFileExtensions(char * aFileExtensions); - - NS_IMETHOD GetMIMEType(char * *aMIMEType); - NS_IMETHOD SetMIMEType(char * aMIMEType); - - NS_IMETHOD GetDescription(PRUnichar * *aDescription); - NS_IMETHOD SetDescription(PRUnichar * aDescription); - - NS_IMETHOD Equals(nsIMIMEInfo *aMIMEInfo, PRBool *_retval); + NS_DECL_NSIMIMEINFO // member variables nsIAtom* mMIMEType; diff --git a/mozilla/netwerk/mime/src/nsMIMEService.h b/mozilla/netwerk/mime/src/nsMIMEService.h index 231de2af0b9..48d889a8c41 100644 --- a/mozilla/netwerk/mime/src/nsMIMEService.h +++ b/mozilla/netwerk/mime/src/nsMIMEService.h @@ -39,13 +39,7 @@ class nsMIMEService : public nsIMIMEService { virtual ~nsMIMEService(); // nsIMIMEService methods - NS_IMETHOD GetFromExtension(const char *aFileExt, nsIMIMEInfo **_retval); - NS_IMETHOD GetTypeFromExtension(const char *aFileExt, char **aContentType); - NS_IMETHOD GetTypeFromURI(nsIURI *aURI, char **aContentType); - NS_IMETHOD GetFromMIMEType(const char *aMIMEType, nsIMIMEInfo **_retval); - - NS_IMETHOD AddMIMEInfo(nsIMIMEInfo *aMIMEInfo); - NS_IMETHOD RemoveMIMEInfo(nsIMIMEInfo *aMIMEInfo); + NS_DECL_NSIMIMESERVICE private: nsresult AddMapping(const char* mimeType, diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBlank.h b/mozilla/netwerk/protocol/about/src/nsAboutBlank.h index aa8cb53b6fd..ab21bbd08cb 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutBlank.h +++ b/mozilla/netwerk/protocol/about/src/nsAboutBlank.h @@ -26,10 +26,7 @@ class nsAboutBlank : public nsIAboutModule public: NS_DECL_ISUPPORTS - NS_IMETHOD NewChannel(const char *verb, - nsIURI *aURI, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **result); + NS_DECL_NSIABOUTMODULE nsAboutBlank() { NS_INIT_REFCNT(); } virtual ~nsAboutBlank() {} diff --git a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.h b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.h index 72cde99bb38..5c02fb46693 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.h +++ b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.h @@ -35,15 +35,7 @@ public: NS_DECL_ISUPPORTS // nsIProtocolHandler methods: - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, - char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, - nsIURI **_retval); - NS_IMETHOD NewChannel(const char* verb, nsIURI* url, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **_retval); + NS_DECL_NSIPROTOCOLHANDLER // nsAboutProtocolHandler methods: nsAboutProtocolHandler(); diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.h b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.h index 368c01df8b2..1bfaa038faa 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.h +++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.h @@ -43,19 +43,10 @@ public: NS_DECL_ISUPPORTS // nsIProtocolHandler methods: - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, - char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, - nsIURI **_retval); - NS_IMETHOD NewChannel(const char* verb, nsIURI* url, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **_retval); + NS_DECL_NSIPROTOCOLHANDLER // nsIFileProtocolHandler methods: - NS_IMETHOD NewChannelFromNativePath(const char* nativePath, - nsIFileChannel* *result); + NS_DECL_NSIFILEPROTOCOLHANDLER // nsFileProtocolHandler methods: nsFileProtocolHandler(); diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.h b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.h index eae3c0a48d7..46b3b85dc02 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.h +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.h @@ -31,15 +31,7 @@ public: NS_DECL_ISUPPORTS // nsIProtocolHandler methods: - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, - char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, - nsIURI **_retval); - NS_IMETHOD NewChannel(const char* verb, nsIURI* url, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **_retval); + NS_DECL_NSIPROTOCOLHANDLER // nsFtpProtocolHandler methods: nsFtpProtocolHandler(); diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.h b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.h index 83619916dd0..b22f0f75f61 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.h @@ -119,12 +119,7 @@ public: }; // Functions from nsIHTTPProtocolHandler - NS_IMETHOD NewEncodeStream(nsIInputStream *rawStream, PRUint32 encodeFlags, - nsIInputStream **_retval); - NS_IMETHOD NewDecodeStream(nsIInputStream *encodedStream, PRUint32 decodeFlags, - nsIInputStream **_retval); - NS_IMETHOD NewPostDataStream(PRBool isFile, const char *data, PRUint32 encodeFlags, - nsIInputStream **_retval); + NS_DECL_NSIHTTPPROTOCOLHANDLER /* Pull out an existing transport from the list, or if none exists diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.h b/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.h index a6b65df9c10..5fbe4c5ad3e 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.h +++ b/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.h @@ -35,8 +35,7 @@ public: NS_DECL_ISUPPORTS // nsIHTTPHeader methods: - NS_IMETHOD GetField(nsIAtom** aResult); - NS_IMETHOD GetValue(char ** aResult); + NS_DECL_NSIHTTPHEADER nsHeaderEntry(nsIAtom* aHeaderAtom, const char* aValue); virtual ~nsHeaderEntry(); diff --git a/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.h b/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.h index 850504f9490..4006bba2c57 100644 --- a/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.h +++ b/mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.h @@ -35,15 +35,7 @@ public: NS_DECL_ISUPPORTS // nsIProtocolHandler methods: - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, - char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, - nsIURI **_retval); - NS_IMETHOD NewChannel(const char* verb, nsIURI* url, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **_retval); + NS_DECL_NSIPROTOCOLHANDLER // nsResourceProtocolHandler methods: nsResourceProtocolHandler(); diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.h b/mozilla/netwerk/streamconv/src/nsStreamConverterService.h index 5e6a80da792..57ca2c1ca44 100644 --- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.h +++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.h @@ -33,8 +33,7 @@ public: ///////////////////////////////////////////////////// // nsIStreamConverterService methods - NS_IMETHOD Convert(nsIInputStream *aFromStream, const PRUnichar *aFromType, const PRUnichar *aToType, nsIInputStream **_retval); - NS_IMETHOD AsyncConvertData(const PRUnichar *aFromType, const PRUnichar *aToType, nsIStreamListener *aListener, nsIStreamListener **_retval); + NS_DECL_NSISTREAMCONVERTERSERVICE ///////////////////////////////////////////////////// // nsStreamConverterService methods diff --git a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.h b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.h index e79061a89f4..15c1f136cf3 100644 --- a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.h +++ b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.h @@ -35,15 +35,7 @@ public: NS_DECL_ISUPPORTS // nsIProtocolHandler methods: - NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD GetDefaultPort(PRInt32 *aDefaultPort); - NS_IMETHOD MakeAbsolute(const char *aRelativeSpec, nsIURI *aBaseURI, - char **_retval); - NS_IMETHOD NewURI(const char *aSpec, nsIURI *aBaseURI, - nsIURI **_retval); - NS_IMETHOD NewChannel(const char* verb, nsIURI* url, - nsIEventSinkGetter *eventSinkGetter, - nsIChannel **_retval); + NS_DECL_NSIPROTOCOLHANDLER // nsChromeProtocolHandler methods: nsChromeProtocolHandler(); diff --git a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.h b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.h index d64b3e0ae22..9f0ae406d59 100644 --- a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.h +++ b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.h @@ -34,16 +34,7 @@ class nsMIMEInfoImpl : public nsIMIMEInfo { PRBool InExtensions(nsIAtom* anIAtom); // nsIMIMEInfo methods - NS_IMETHOD GetFileExtensions(char * *aFileExtensions); - NS_IMETHOD SetFileExtensions(char * aFileExtensions); - - NS_IMETHOD GetMIMEType(char * *aMIMEType); - NS_IMETHOD SetMIMEType(char * aMIMEType); - - NS_IMETHOD GetDescription(PRUnichar * *aDescription); - NS_IMETHOD SetDescription(PRUnichar * aDescription); - - NS_IMETHOD Equals(nsIMIMEInfo *aMIMEInfo, PRBool *_retval); + NS_DECL_NSIMIMEINFO // member variables nsIAtom* mMIMEType; diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 12c0d323931..190835d2aba 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -379,14 +379,7 @@ public: #ifdef NECKO // nsIPrompt - NS_IMETHOD Alert(const PRUnichar *text); - NS_IMETHOD Confirm(const PRUnichar *text, PRBool *_retval); - NS_IMETHOD ConfirmCheck(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); - NS_IMETHOD ConfirmYN(const PRUnichar *text, PRBool *_retval); - NS_IMETHOD ConfirmCheckYN(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); - NS_IMETHOD Prompt(const PRUnichar *text, const PRUnichar *defaultText, PRUnichar **result, PRBool *_retval); - NS_IMETHOD PromptUsernameAndPassword(const PRUnichar *text, PRUnichar **user, PRUnichar **pwd, PRBool *_retval); - NS_IMETHOD PromptPassword(const PRUnichar *text, PRUnichar **pwd, PRBool *_retval); + NS_DECL_NSIPROMPT #else // nsINetSupport interface methods NS_IMETHOD_(void) Alert(const nsString &aText); diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.h b/mozilla/webshell/tests/viewer/nsBrowserWindow.h index 7e433da9204..ed43019e024 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.h +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.h @@ -112,14 +112,10 @@ public: #ifdef NECKO // nsIStreamObserver - NS_IMETHOD OnStartRequest(nsIChannel* channel, nsISupports *ctxt); - NS_IMETHOD OnStopRequest(nsIChannel* channel, nsISupports *ctxt, - nsresult status, const PRUnichar *errorMsg); + NS_DECL_NSISTREAMOBSERVER // nsIProgressEventSink - NS_IMETHOD OnProgress(nsIChannel* channel, nsISupports *ctxt, - PRUint32 aProgress, PRUint32 aProgressMax); - NS_IMETHOD OnStatus(nsIChannel* channel, nsISupports *ctxt, const PRUnichar *aMsg); + NS_DECL_NSIPROGRESSEVENTSINK #else // nsIStreamObserver diff --git a/mozilla/xpfe/appshell/src/nsNetSupportDialog.h b/mozilla/xpfe/appshell/src/nsNetSupportDialog.h index 2e96a87d790..09d2ab9aff6 100644 --- a/mozilla/xpfe/appshell/src/nsNetSupportDialog.h +++ b/mozilla/xpfe/appshell/src/nsNetSupportDialog.h @@ -38,14 +38,7 @@ public: #ifdef NECKO // nsIPrompt - NS_IMETHOD Alert(const PRUnichar *text); - NS_IMETHOD Confirm(const PRUnichar *text, PRBool *_retval); - NS_IMETHOD ConfirmCheck(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); - NS_IMETHOD ConfirmYN(const PRUnichar *text, PRBool *_retval); - NS_IMETHOD ConfirmCheckYN(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); - NS_IMETHOD Prompt(const PRUnichar *text, const PRUnichar *defaultText, PRUnichar **result, PRBool *_retval); - NS_IMETHOD PromptUsernameAndPassword(const PRUnichar *text, PRUnichar **user, PRUnichar **pwd, PRBool *_retval); - NS_IMETHOD PromptPassword(const PRUnichar *text, PRUnichar **pwd, PRBool *_retval); + NS_DECL_NSIPROMPT #else NS_IMETHOD Alert( const nsString &aText ); NS_IMETHOD Confirm( const nsString &aText,PRInt32* returnValue ); diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.h b/mozilla/xpfe/appshell/src/nsWebShellWindow.h index a39aac6acc6..8e56d6aee41 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.h +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.h @@ -263,14 +263,9 @@ public: NS_DECL_IURLDISPATCHER // nsINetSupport - NS_IMETHOD Alert(const PRUnichar *text); - NS_IMETHOD Confirm(const PRUnichar *text, PRBool *_retval); - NS_IMETHOD ConfirmCheck(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); - NS_IMETHOD Prompt(const PRUnichar *text, const PRUnichar *defaultText, PRUnichar **result, PRBool *_retval); - NS_IMETHOD PromptUsernameAndPassword(const PRUnichar *text, PRUnichar **user, PRUnichar **pwd, PRBool *_retval); - NS_IMETHOD PromptPassword(const PRUnichar *text, PRUnichar **pwd, PRBool *_retval); - NS_IMETHOD ConfirmYN(const PRUnichar *text, PRBool *_retval); - NS_IMETHOD ConfirmCheckYN(const PRUnichar *text, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval); + + // nsIPrompt + NS_DECL_NSIPROMPT // nsIModalWindowSupport NS_IMETHOD PrepareModality();