зеркало из https://github.com/mozilla/pjs.git
remove all references to the old nsIMessenger
This commit is contained in:
Родитель
ffb58c2f10
Коммит
7e8d763a59
|
@ -27,6 +27,7 @@
|
||||||
#include "nsCRT.h"
|
#include "nsCRT.h"
|
||||||
#include "nsCOMPtr.h"
|
#include "nsCOMPtr.h"
|
||||||
|
|
||||||
|
#include "nsMessenger.h"
|
||||||
#include "nsMsgGroupRecord.h"
|
#include "nsMsgGroupRecord.h"
|
||||||
|
|
||||||
#include "nsMsgAppCore.h"
|
#include "nsMsgAppCore.h"
|
||||||
|
|
|
@ -17,6 +17,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "nsMessenger.h"
|
#include "nsMessenger.h"
|
||||||
|
#include "nsIAppShellService.h"
|
||||||
|
#include "nsIServiceManager.h"
|
||||||
#include "nsMessengerNameSet.h"
|
#include "nsMessengerNameSet.h"
|
||||||
#include "nsIScriptNameSetRegistry.h"
|
#include "nsIScriptNameSetRegistry.h"
|
||||||
|
|
||||||
|
@ -123,24 +125,3 @@ NS_NewMessengerBootstrap(const nsIID &aIID, void ** msgboot)
|
||||||
return bootstrap->QueryInterface(aIID, msgboot);
|
return bootstrap->QueryInterface(aIID, msgboot);
|
||||||
}
|
}
|
||||||
|
|
||||||
// nsMessenger implementation
|
|
||||||
|
|
||||||
class nsMessenger : public nsIMessenger {
|
|
||||||
|
|
||||||
public:
|
|
||||||
NS_DECL_ISUPPORTS
|
|
||||||
};
|
|
||||||
|
|
||||||
NS_IMPL_ISUPPORTS(nsMessenger, nsIMessenger::GetIID())
|
|
||||||
|
|
||||||
|
|
||||||
nsresult
|
|
||||||
NS_NewMessenger(const nsIID &aIID, void **msg)
|
|
||||||
{
|
|
||||||
if (!msg) return NS_ERROR_NULL_POINTER;
|
|
||||||
nsMessenger *messenger =
|
|
||||||
new nsMessenger();
|
|
||||||
if (!messenger) return NS_ERROR_OUT_OF_MEMORY;
|
|
||||||
return messenger->QueryInterface(aIID, msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#define __nsMessenger_h
|
#define __nsMessenger_h
|
||||||
|
|
||||||
#include "nscore.h"
|
#include "nscore.h"
|
||||||
#include "nsIMessenger.h"
|
|
||||||
#include "nsIServiceManager.h"
|
#include "nsIServiceManager.h"
|
||||||
#include "nsIAppShellService.h"
|
#include "nsIAppShellService.h"
|
||||||
|
|
||||||
|
@ -38,8 +37,6 @@
|
||||||
|
|
||||||
NS_BEGIN_EXTERN_C
|
NS_BEGIN_EXTERN_C
|
||||||
|
|
||||||
nsresult NS_NewMessenger(const nsIID &aIID, void **inst);
|
|
||||||
|
|
||||||
nsresult NS_NewMessengerBootstrap(const nsIID &aIID, void ** inst);
|
nsresult NS_NewMessengerBootstrap(const nsIID &aIID, void ** inst);
|
||||||
|
|
||||||
NS_END_EXTERN_C
|
NS_END_EXTERN_C
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include "nsIScriptContext.h"
|
#include "nsIScriptContext.h"
|
||||||
#include "nsIScriptNameSpaceManager.h"
|
#include "nsIScriptNameSpaceManager.h"
|
||||||
#include "nsIScriptExternalNameSet.h"
|
#include "nsIScriptExternalNameSet.h"
|
||||||
#include "nsMessenger.h"
|
|
||||||
|
|
||||||
|
|
||||||
/* hack the AppCore stuff here */
|
/* hack the AppCore stuff here */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче