From 62d42630f934a3657db5092078f0c4a852833eee Mon Sep 17 00:00:00 2001 From: "mccabe%netscape.com" Date: Mon, 23 Aug 1999 01:41:52 +0000 Subject: [PATCH] Remove unused explicit NS_DECL_IFOO declarations from %{C++ blocks in the header files; these are replaced by xpidl-generated NS_DECL_NSIFOO macros. --- .../find/public/nsIFindComponent.idl | 6 ------ .../find/public/nsISearchContext.idl | 19 ------------------- .../public/nsIAppShellComponent.idl | 6 ------ .../public/nsISampleAppShellComponent.idl | 2 -- .../ucth/public/nsIUnkContentTypeHandler.idl | 2 -- .../xfer/public/nsIStreamTransfer.idl | 3 --- .../public/nsIStreamTransferOperation.idl | 10 ---------- 7 files changed, 48 deletions(-) diff --git a/xpfe/components/find/public/nsIFindComponent.idl b/xpfe/components/find/public/nsIFindComponent.idl index 3e52dcd394b6..635f9653fe19 100644 --- a/xpfe/components/find/public/nsIFindComponent.idl +++ b/xpfe/components/find/public/nsIFindComponent.idl @@ -117,10 +117,4 @@ interface nsIFindComponent : nsIAppShellComponent { %{C++ #define NS_IFINDCOMPONENT_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/find" #define NS_IFINDCOMPONENT_CLASSNAME "Mozilla Find Component" -#define NS_DECL_IFINDCOMPONENT \ - NS_IMETHOD CreateContext( nsIWebShell *, nsIEditor *, nsISupports ** ); \ - NS_IMETHOD Find( nsISupports *, PRBool * ); \ - NS_IMETHOD Replace( nsISupports * ); \ - NS_IMETHOD FindNext( nsISupports *, PRBool * ); \ - NS_IMETHOD ResetContext( nsISupports *, nsIWebShell *, nsIEditor * ); %} diff --git a/xpfe/components/find/public/nsISearchContext.idl b/xpfe/components/find/public/nsISearchContext.idl index 11e11500fd59..5c15c7494e80 100644 --- a/xpfe/components/find/public/nsISearchContext.idl +++ b/xpfe/components/find/public/nsISearchContext.idl @@ -48,22 +48,3 @@ interface nsISearchContext : nsISupports { void ConvertToWeakReference(); void ConvertToOwningReference(); }; - -%{C++ -#define NS_DECL_ISEARCHCONTEXT \ - NS_IMETHOD GetSearchString(PRUnichar**); \ - NS_IMETHOD SetSearchString(PRUnichar*); \ - NS_IMETHOD GetReplaceString(PRUnichar**); \ - NS_IMETHOD SetReplaceString(PRUnichar*); \ - NS_IMETHOD GetSearchBackwards(PRBool*); \ - NS_IMETHOD SetSearchBackwards(PRBool); \ - NS_IMETHOD GetCaseSensitive(PRBool*); \ - NS_IMETHOD SetCaseSensitive(PRBool); \ - NS_IMETHOD GetWrapSearch(PRBool*); \ - NS_IMETHOD SetWrapSearch(PRBool); \ - NS_IMETHOD GetTargetWebShell(nsIWebShell**); \ - NS_IMETHOD GetFindDialog(nsIDOMWindow**); \ - NS_IMETHOD SetFindDialog(nsIDOMWindow*); \ - NS_IMETHOD ConvertToWeakReference(); \ - NS_IMETHOD ConvertToOwningReference(); -%} diff --git a/xpfe/components/public/nsIAppShellComponent.idl b/xpfe/components/public/nsIAppShellComponent.idl index 4c96408053b5..b117dc6d3eb4 100644 --- a/xpfe/components/public/nsIAppShellComponent.idl +++ b/xpfe/components/public/nsIAppShellComponent.idl @@ -88,10 +88,4 @@ interface nsIAppShellComponent : nsISupports { #define NS_IAPPSHELLCOMPONENT_PROGID "component://netscape/appshell/component" #define NS_IAPPSHELLCOMPONENT_CLASSNAME "Mozilla AppShell Component" #define NS_IAPPSHELLCOMPONENT_KEY "software/netscape/appshell/components" - -#define NS_DECL_IAPPSHELLCOMPONENT \ - NS_IMETHOD Initialize( nsIAppShellService*, \ - nsICmdLineService* ); \ - NS_IMETHOD Shutdown(); - %} diff --git a/xpfe/components/sample/public/nsISampleAppShellComponent.idl b/xpfe/components/sample/public/nsISampleAppShellComponent.idl index 4b834a5f0ad8..45eace669a7c 100644 --- a/xpfe/components/sample/public/nsISampleAppShellComponent.idl +++ b/xpfe/components/sample/public/nsISampleAppShellComponent.idl @@ -48,6 +48,4 @@ interface nsISampleAppShellComponent : nsIAppShellComponent { %{C++ #define NS_ISAMPLEAPPSHELLCOMPONENT_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/sample" #define NS_ISAMPLEAPPSHELLCOMPONENT_CLASSNAME "Mozilla Sample App Shell Component" -#define NS_DECL_ISAMPLEAPPSHELLCOMPONENT \ - NS_IMETHOD DoDialogTests( nsISupports *, nsIObserver * ); %} diff --git a/xpfe/components/ucth/public/nsIUnkContentTypeHandler.idl b/xpfe/components/ucth/public/nsIUnkContentTypeHandler.idl index eef0918b4210..82cf7f9093ed 100644 --- a/xpfe/components/ucth/public/nsIUnkContentTypeHandler.idl +++ b/xpfe/components/ucth/public/nsIUnkContentTypeHandler.idl @@ -58,6 +58,4 @@ interface nsIUnknownContentTypeHandler : nsIAppShellComponent { %{C++ #define NS_IUNKNOWNCONTENTTYPEHANDLER_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/unknownContentType" #define NS_IUNKNOWNCONTENTTYPEHANDLER_CLASSNAME "Mozilla Unknown Content-Type Handler Component" -#define NS_DECL_IUNKNOWNCONTENTTYPEHANDLER \ - NS_IMETHOD HandleUnknownContentType( nsIChannel*, const char*, nsIDOMWindow*); %} diff --git a/xpfe/components/xfer/public/nsIStreamTransfer.idl b/xpfe/components/xfer/public/nsIStreamTransfer.idl index f8b846e0964d..1784506b63c3 100644 --- a/xpfe/components/xfer/public/nsIStreamTransfer.idl +++ b/xpfe/components/xfer/public/nsIStreamTransfer.idl @@ -59,7 +59,4 @@ interface nsIStreamTransfer : nsIAppShellComponent { %{C++ #define NS_ISTREAMTRANSFER_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/xfer" #define NS_ISTREAMTRANSFER_CLASSNAME "Mozilla Stream Transfer Component" -#define NS_DECL_ISTREAMTRANSFER \ - NS_IMETHOD SelectFileAndTransferLocation( nsIURI*, nsIDOMWindow* ); \ - NS_IMETHOD SelectFileAndTransferLocationSpec( char const*, nsIDOMWindow* ); %} diff --git a/xpfe/components/xfer/public/nsIStreamTransferOperation.idl b/xpfe/components/xfer/public/nsIStreamTransferOperation.idl index 85383e38d611..f9f7d18b66e7 100644 --- a/xpfe/components/xfer/public/nsIStreamTransferOperation.idl +++ b/xpfe/components/xfer/public/nsIStreamTransferOperation.idl @@ -38,13 +38,3 @@ interface nsIStreamTransferOperation : nsISupports { void Start(); void Stop(); }; - -%{C++ -#define NS_DECL_ISTREAMTRANSFEROPERATION \ - NS_IMETHOD GetSource( char** ); \ - NS_IMETHOD GetTarget( char** ); \ - NS_IMETHOD GetObserver( nsIObserver** ); \ - NS_IMETHOD SetObserver( nsIObserver* ); \ - NS_IMETHOD Start( void ); \ - NS_IMETHOD Stop( void ); -%}