From bd02b8968d26da86d53a7a1306974d34e1e5b1b6 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 22 Sep 2017 10:58:11 +0200 Subject: [PATCH] feat(c-wrapper): remove CPP_TYPE parameter of L_SET_USER_DATA_FROM_C_OBJECT --- src/c-wrapper/api/c-call-params.cpp | 2 +- src/c-wrapper/api/c-call.cpp | 2 +- src/c-wrapper/api/c-chat-message.cpp | 2 +- src/c-wrapper/api/c-chat-room.cpp | 2 +- src/c-wrapper/api/c-participant.cpp | 2 +- src/c-wrapper/internal/c-tools.h | 14 +++++++------- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/c-wrapper/api/c-call-params.cpp b/src/c-wrapper/api/c-call-params.cpp index 9d8fc7974..e6573061e 100644 --- a/src/c-wrapper/api/c-call-params.cpp +++ b/src/c-wrapper/api/c-call-params.cpp @@ -489,7 +489,7 @@ void *linphone_call_params_get_user_data (const LinphoneCallParams *cp) { } void linphone_call_params_set_user_data (LinphoneCallParams *cp, void *ud) { - L_SET_USER_DATA_FROM_C_OBJECT(cp, ud, MediaSessionParams); + L_SET_USER_DATA_FROM_C_OBJECT(cp, ud); } LinphoneCallParams *linphone_call_params_ref (LinphoneCallParams *cp) { diff --git a/src/c-wrapper/api/c-call.cpp b/src/c-wrapper/api/c-call.cpp index 10e7cc5c0..c31c45354 100644 --- a/src/c-wrapper/api/c-call.cpp +++ b/src/c-wrapper/api/c-call.cpp @@ -1178,7 +1178,7 @@ void *linphone_call_get_user_data (const LinphoneCall *call) { } void linphone_call_set_user_data (LinphoneCall *call, void *ud) { - L_SET_USER_DATA_FROM_C_OBJECT(call, ud, Call); + L_SET_USER_DATA_FROM_C_OBJECT(call, ud); } // ============================================================================= diff --git a/src/c-wrapper/api/c-chat-message.cpp b/src/c-wrapper/api/c-chat-message.cpp index 355a86c2b..b2665f26a 100644 --- a/src/c-wrapper/api/c-chat-message.cpp +++ b/src/c-wrapper/api/c-chat-message.cpp @@ -96,7 +96,7 @@ void * linphone_chat_message_get_user_data (const LinphoneChatMessage *msg) { } void linphone_chat_message_set_user_data (LinphoneChatMessage *msg, void *ud) { - L_SET_USER_DATA_FROM_C_OBJECT(msg, ud, ChatMessage); + L_SET_USER_DATA_FROM_C_OBJECT(msg, ud); } diff --git a/src/c-wrapper/api/c-chat-room.cpp b/src/c-wrapper/api/c-chat-room.cpp index 9ed6d2beb..48eaee264 100644 --- a/src/c-wrapper/api/c-chat-room.cpp +++ b/src/c-wrapper/api/c-chat-room.cpp @@ -262,7 +262,7 @@ void *linphone_chat_room_get_user_data (const LinphoneChatRoom *cr) { } void linphone_chat_room_set_user_data (LinphoneChatRoom *cr, void *ud) { - L_SET_USER_DATA_FROM_C_OBJECT(cr, ud, ChatRoom); + L_SET_USER_DATA_FROM_C_OBJECT(cr, ud); } // ============================================================================= diff --git a/src/c-wrapper/api/c-participant.cpp b/src/c-wrapper/api/c-participant.cpp index 66d5f39b1..89ff5ee1f 100644 --- a/src/c-wrapper/api/c-participant.cpp +++ b/src/c-wrapper/api/c-participant.cpp @@ -43,7 +43,7 @@ void *linphone_participant_get_user_data(const LinphoneParticipant *participant) } void linphone_participant_set_user_data(LinphoneParticipant *participant, void *ud) { - L_SET_USER_DATA_FROM_C_OBJECT(participant, ud, Participant); + L_SET_USER_DATA_FROM_C_OBJECT(participant, ud); } const LinphoneAddress *linphone_participant_get_address (const LinphoneParticipant *participant) { diff --git a/src/c-wrapper/internal/c-tools.h b/src/c-wrapper/internal/c-tools.h index 6da6bd2ab..10821be11 100644 --- a/src/c-wrapper/internal/c-tools.h +++ b/src/c-wrapper/internal/c-tools.h @@ -394,7 +394,7 @@ LINPHONE_END_NAMESPACE // Call the init function of wrapped C object. #define L_INIT(C_TYPE) _linphone_ ## C_TYPE ## _init () -// Get the cpp-ptr of a wrapped C object. +// Get/set the cpp-ptr of a wrapped C object. #define L_GET_CPP_PTR_FROM_C_OBJECT(C_OBJECT) \ LINPHONE_NAMESPACE::Wrapper::getCppPtrFromC< \ L_CPP_TYPE_OF_C_OBJECT(C_OBJECT), \ @@ -416,19 +416,19 @@ LINPHONE_END_NAMESPACE )) // Get the wrapped C object of a C++ object. -#define L_GET_C_BACK_PTR(OBJECT, C_TYPE) \ +#define L_GET_C_BACK_PTR(C_OBJECT, C_TYPE) \ LINPHONE_NAMESPACE::Wrapper::getCBackPtr( \ - OBJECT, _linphone_ ## C_TYPE ## _init \ + C_OBJECT, _linphone_ ## C_TYPE ## _init \ ) // Get/set user data on a wrapped C object. -#define L_GET_USER_DATA_FROM_C_OBJECT(OBJECT) \ +#define L_GET_USER_DATA_FROM_C_OBJECT(C_OBJECT) \ LINPHONE_NAMESPACE::Wrapper::getUserData( \ - L_GET_CPP_PTR_FROM_C_OBJECT(OBJECT) \ + L_GET_CPP_PTR_FROM_C_OBJECT(C_OBJECT) \ ) -#define L_SET_USER_DATA_FROM_C_OBJECT(OBJECT, VALUE, CPP_TYPE) \ +#define L_SET_USER_DATA_FROM_C_OBJECT(C_OBJECT, VALUE) \ LINPHONE_NAMESPACE::Wrapper::setUserData( \ - L_GET_CPP_PTR_FROM_C_OBJECT(OBJECT), \ + L_GET_CPP_PTR_FROM_C_OBJECT(C_OBJECT), \ VALUE \ )