diff options
Diffstat (limited to 'amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h')
| -rw-r--r-- | amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h index 96ddd9a2..b332bc63 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h @@ -219,7 +219,7 @@ typedef unsigned int MMRESULT; #if defined(__cplusplus) && !defined(CINTERFACE) #define _INTERFACE struct -#define STDQT_METHOD(method) virtual HX_RESULT STDMETHODCALLTYPE method +#define STDTQT_METHOD(method) virtual HX_RESULT STDMETHODCALLTYPE method #define STDMETHOD_(type,method) virtual type STDMETHODCALLTYPE method #define PURE = 0 #define THIS_ @@ -250,7 +250,7 @@ typedef unsigned int MMRESULT; #define _INTERFACE struct -#define STDQT_METHOD(method) HX_RESULT (STDMETHODCALLTYPE * method) +#define STDTQT_METHOD(method) HX_RESULT (STDMETHODCALLTYPE * method) #define STDMETHOD_(type,method) type (STDMETHODCALLTYPE * method) #if !defined(BEGIN_INTERFACE) @@ -474,7 +474,7 @@ DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, DECLARE_INTERFACE(IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -510,7 +510,7 @@ DECLARE_INTERFACE_(IMalloc, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -648,7 +648,7 @@ inline HXBOOL HXIsEqualGUID(REFGUID rguid1, REFGUID rguid2) * * Example Usage: * - * QInterfaceList qiList[] = + * TQInterfaceList qiList[] = * { * { GET_IIDHANDLE(IID_IUnknown), (IUnknown*) (IHXPlugin*) this}, * { GET_IIDHANDLE(IID_IHXPlugin), (IHXPlugin*) this}, @@ -662,7 +662,7 @@ inline HXBOOL HXIsEqualGUID(REFGUID rguid1, REFGUID rguid2) * { GET_IIDHANDLE(IID_IHXScheduler), m_pScheduler} * }; * - * return QIFind(qiList, QILISTSIZE(qiList), riid, ppvObj); + * return TQIFind(qiList, TQILISTSIZE(qiList), riid, ppvObj); */ #if !defined(HELIX_FEATURE_FULLGUID) @@ -682,15 +682,15 @@ typedef struct { IIDHANDLE hiid; void* pIFace; -} QInterfaceList; +} TQInterfaceList; -#define QILISTSIZE(x) sizeof(x)/sizeof(QInterfaceList) +#define TQILISTSIZE(x) sizeof(x)/sizeof(TQInterfaceList) #if !defined(INITGUID) || (defined(_STATICALLY_LINKED) && !defined(NCIHACK)) -EXTERN_C HX_RESULT QIFind(QInterfaceList* qiList, UINT32 ulqiListSize, +EXTERN_C HX_RESULT TQIFind(TQInterfaceList* qiList, UINT32 ulqiListSize, REFIID riid, void** ppvObj); #else // !INITGUID || (_STATICALLY_LINKED && NCIHACK) -EXTERN_C HX_RESULT QIFind(QInterfaceList* qiList, UINT32 ulqiListSize, +EXTERN_C HX_RESULT TQIFind(TQInterfaceList* qiList, UINT32 ulqiListSize, REFIID riid, void** ppvObj) { do |