Bug 900908 - Part 4: Remove numbered macros in nsIClassInfoImpl.h/nsISupportsImpl.h. r=froydnj

This commit is contained in:
Birunthan Mohanathas 2014-04-27 03:07:00 -04:00
Родитель 5f1fde8824
Коммит 764bbc2196
2 изменённых файлов: 0 добавлений и 226 удалений

Просмотреть файл

@ -159,30 +159,6 @@ NS_CI_INTERFACE_GETTER_NAME(_class)(uint32_t *count, nsIID ***array) \
MOZ_FOR_EACH(NS_CLASSINFO_HELPER_ENTRY, (), (__VA_ARGS__)) \
NS_CLASSINFO_HELPER_END
// TODO: Remove these after changing everything to the variadic variant.
#define NS_IMPL_CI_INTERFACE_GETTER1(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER2(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER3(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER4(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER5(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER6(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER7(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER8(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER9(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER10(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_CI_INTERFACE_GETTER11(aClass, ...) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_CI(aClass, ...) \
MOZ_STATIC_ASSERT_VALID_ARG_COUNT(__VA_ARGS__); \
NS_INTERFACE_MAP_BEGIN(aClass) \
@ -191,58 +167,10 @@ NS_CI_INTERFACE_GETTER_NAME(_class)(uint32_t *count, nsIID ***array) \
NS_IMPL_QUERY_CLASSINFO(aClass) \
NS_INTERFACE_MAP_END
// TODO: Remove these after changing everything to the variadic variant.
#define NS_IMPL_QUERY_INTERFACE1_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE2_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE3_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE4_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE5_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE6_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE7_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE8_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE9_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE10_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE11_CI(aClass, ...) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_CI(aClass, ...) \
NS_IMPL_ADDREF(aClass) \
NS_IMPL_RELEASE(aClass) \
NS_IMPL_QUERY_INTERFACE_CI(aClass, __VA_ARGS__) \
NS_IMPL_CI_INTERFACE_GETTER(aClass, __VA_ARGS__)
// TODO: Remove these after changing everything to the variadic variant.
#define NS_IMPL_ISUPPORTS1_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS2_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS3_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS4_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS5_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS6_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS7_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS8_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS9_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS10_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS11_CI(aClass, ...) \
NS_IMPL_ISUPPORTS_CI(aClass, __VA_ARGS__)
#endif // nsIClassInfoImpl_h__

Просмотреть файл

@ -834,34 +834,6 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr) \
MOZ_ARG_1(__VA_ARGS__)) \
NS_INTERFACE_TABLE_END
// TODO: Remove these after changing everything to the variadic variant.
#define NS_INTERFACE_TABLE1(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE2(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE3(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE4(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE5(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE6(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE7(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE8(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE9(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE10(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE11(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE12(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE13(aClass, ...) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE0(_class) \
NS_INTERFACE_TABLE_HEAD(_class) \
NS_INTERFACE_TABLE0(_class) \
@ -872,34 +844,6 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr) \
NS_INTERFACE_TABLE(aClass, __VA_ARGS__) \
NS_INTERFACE_TABLE_TAIL
// TODO: Remove these after changing everything to the variadic variant.
#define NS_IMPL_QUERY_INTERFACE1(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE2(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE3(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE4(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE5(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE6(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE7(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE8(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE9(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE10(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE11(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE12(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE13(aClass, ...) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
/**
* Declare that you're going to inherit from something that already
* implements nsISupports, but also implements an additional interface, thus
@ -967,32 +911,6 @@ NS_IMETHODIMP_(MozExternalRefCountType) Class::Release(void) \
MOZ_FOR_EACH(NS_INTERFACE_TABLE_ENTRY, (aClass,), (__VA_ARGS__)) \
NS_INTERFACE_TABLE_END
// TODO: Remove these after changing everything to the variadic variant.
#define NS_INTERFACE_TABLE_INHERITED1(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED2(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED3(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED4(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED5(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED6(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED7(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED8(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED9(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED10(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED11(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_INTERFACE_TABLE_INHERITED12(aClass, ...) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED0(aClass, aSuper) \
NS_INTERFACE_TABLE_HEAD(aClass) \
NS_INTERFACE_TABLE_INHERITED0(aClass) \
@ -1003,28 +921,6 @@ NS_IMETHODIMP_(MozExternalRefCountType) Class::Release(void) \
NS_INTERFACE_TABLE_INHERITED(aClass, __VA_ARGS__) \
NS_INTERFACE_TABLE_TAIL_INHERITING(aSuper)
// TODO: Remove these after changing everything to the variadic variant.
#define NS_IMPL_QUERY_INTERFACE_INHERITED1(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED2(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED3(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED4(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED5(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED6(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED7(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED8(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED9(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_QUERY_INTERFACE_INHERITED10(aClass, aSuper, ...) \
NS_IMPL_QUERY_INTERFACE_INHERITED(aClass, aSuper, __VA_ARGS__)
/**
* Convenience macros for implementing all nsISupports methods for
* a simple class.
@ -1043,34 +939,6 @@ NS_IMETHODIMP_(MozExternalRefCountType) Class::Release(void) \
NS_IMPL_RELEASE(aClass) \
NS_IMPL_QUERY_INTERFACE(aClass, __VA_ARGS__)
// TODO: Remove these after changing everything to the variadic variant.
#define NS_IMPL_ISUPPORTS1(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS2(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS3(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS4(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS5(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS6(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS7(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS8(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS9(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS10(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS11(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS12(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS13(aClass, ...) \
NS_IMPL_ISUPPORTS(aClass, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED0(aClass, aSuper) \
NS_IMPL_QUERY_INTERFACE_INHERITED0(aClass, aSuper) \
NS_IMPL_ADDREF_INHERITED(aClass, aSuper) \
@ -1081,28 +949,6 @@ NS_IMETHODIMP_(MozExternalRefCountType) Class::Release(void) \
NS_IMPL_ADDREF_INHERITED(aClass, aSuper) \
NS_IMPL_RELEASE_INHERITED(aClass, aSuper)
// TODO: Remove these after changing everything to the variadic variant.
#define NS_IMPL_ISUPPORTS_INHERITED1(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED2(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED3(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED4(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED5(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED6(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED7(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED8(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED9(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
#define NS_IMPL_ISUPPORTS_INHERITED10(aClass, aSuper, ...) \
NS_IMPL_ISUPPORTS_INHERITED(aClass, aSuper, __VA_ARGS__)
/*
* Macro to glue together a QI that starts with an interface table
* and segues into an interface map (e.g. it uses singleton classinfo