wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 514280 Remove GetIID r=bsmedberg

Browse Source 
--HG--
extra : rebase_source : b913300be047e87c24fb95f7bd17793ebd2c5995
This commit is contained in:
Neil Rashbrook 2014-03-18 00:23:11 +00:00
parent c3b2f90f39
commit e84482e439
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
uriloader/exthandler/android/nsExternalSharingAppService.cpp
View File

@ -52,7 +52,7 @@ nsExternalSharingAppService::GetSharingApps(const nsAString & aMIMEType,
static_cast<nsISharingHandlerApp**>(NS_Alloc(sizeof(nsISharingHandlerApp*) static_cast<nsISharingHandlerApp**>(NS_Alloc(sizeof(nsISharingHandlerApp*)
* *aLen)); * *aLen));
for (uint32_t i = 0; i < *aLen; i++) { for (uint32_t i = 0; i < *aLen; i++) {
rv = array->QueryElementAt(i, nsISharingHandlerApp::GetIID(), rv = array->QueryElementAt(i, NS_GET_IID(nsISharingHandlerApp),
(void**)(*aHandlers + i)); (void**)(*aHandlers + i));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
} }

5
xpcom/glue/nsID.h
View File

@ -123,8 +123,7 @@ typedef nsID nsIID;
struct COMTypeInfo \ struct COMTypeInfo \
{ \ { \
static const nsIID kIID NS_HIDDEN; \ static const nsIID kIID NS_HIDDEN; \
}; \ };
static const nsIID& GetIID() {return COMTypeInfo<int>::kIID;}
#define NS_DEFINE_STATIC_IID_ACCESSOR(the_interface, the_iid) \ #define NS_DEFINE_STATIC_IID_ACCESSOR(the_interface, the_iid) \
template <class Dummy> \ template <class Dummy> \
@ -137,7 +136,7 @@ typedef nsID nsIID;
#define NS_DEFINE_STATIC_CID_ACCESSOR(the_cid) \ #define NS_DEFINE_STATIC_CID_ACCESSOR(the_cid) \
static const nsID& GetCID() {static const nsID cid = the_cid; return cid;} static const nsID& GetCID() {static const nsID cid = the_cid; return cid;}
#define NS_GET_IID(T) (::T::COMTypeInfo<int>::kIID) #define NS_GET_IID(T) (T::COMTypeInfo<int>::kIID)
#define NS_GET_TEMPLATE_IID(T) (T::template COMTypeInfo<int>::kIID) #define NS_GET_TEMPLATE_IID(T) (T::template COMTypeInfo<int>::kIID)
#endif #endif

4
xpcom/tests/TestCOMPtr.cpp
View File

@ -137,7 +137,7 @@ IFoo::QueryInterface( const nsIID& aIID, void** aResult )
nsISupports* rawPtr = 0; nsISupports* rawPtr = 0;
nsresult status = NS_OK; nsresult status = NS_OK;
if ( aIID.Equals(GetIID()) ) if ( aIID.Equals(NS_GET_IID(IFoo)) )
rawPtr = this; rawPtr = this;
else else
{ {
@ -227,7 +227,7 @@ IBar::QueryInterface( const nsID& aIID, void** aResult )
nsISupports* rawPtr = 0; nsISupports* rawPtr = 0;
nsresult status = NS_OK; nsresult status = NS_OK;
if ( aIID.Equals(GetIID()) ) if ( aIID.Equals(NS_GET_IID(IBar)) )
rawPtr = this; rawPtr = this;
else if ( aIID.Equals(NS_GET_IID(IFoo)) ) else if ( aIID.Equals(NS_GET_IID(IFoo)) )
rawPtr = static_cast<IFoo*>(this); rawPtr = static_cast<IFoo*>(this);

2
xpcom/tests/TestHashtables.cpp
View File

@ -281,7 +281,7 @@ IFoo::QueryInterface( const nsIID& aIID, void** aResult )
nsISupports* rawPtr = 0; nsISupports* rawPtr = 0;
nsresult status = NS_OK; nsresult status = NS_OK;
if ( aIID.Equals(GetIID()) ) if ( aIID.Equals(NS_GET_IID(IFoo)) )
rawPtr = this; rawPtr = this;
else else
{ {

4
xpcom/tests/TestRefPtr.cpp
View File

@ -138,7 +138,7 @@ Foo::QueryInterface( const nsIID& aIID, void** aResult )
nsISupports* rawPtr = 0; nsISupports* rawPtr = 0;
nsresult status = NS_OK; nsresult status = NS_OK;
if ( aIID.Equals(GetIID()) ) if ( aIID.Equals(NS_GET_IID(Foo)) )
rawPtr = this; rawPtr = this;
else else
{ {
@ -228,7 +228,7 @@ Bar::QueryInterface( const nsID& aIID, void** aResult )
nsISupports* rawPtr = 0; nsISupports* rawPtr = 0;
nsresult status = NS_OK; nsresult status = NS_OK;
if ( aIID.Equals(GetIID()) ) if ( aIID.Equals(NS_GET_IID(Bar)) )
rawPtr = this; rawPtr = this;
else if ( aIID.Equals(NS_GET_IID(Foo)) ) else if ( aIID.Equals(NS_GET_IID(Foo)) )
rawPtr = static_cast<Foo*>(this); rawPtr = static_cast<Foo*>(this);