mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-19 12:08:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Getter functions need to start with "get".

Browse source
This commit is contained in:
Ghislain MARY 2013-10-07 11:20:04 +02:00
parent 73864e1138
commit d10ab0a250
10 changed files with 71 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/friend.c
View file

@ -300,7 +300,7 @@ LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFriend *lf){
if (lf->presence != NULL) {
basic_status = linphone_presence_model_get_basic_status(lf->presence);
nb_activities = linphone_presence_model_nb_activities(lf->presence);
nb_activities = linphone_presence_model_get_nb_activities(lf->presence);
online_status = (basic_status == LinphonePresenceBasicStatusOpen) ? LinphoneStatusOnline : LinphoneStatusOffline;
if (nb_activities > 1) {
char *tmp = NULL;

42
coreapi/linphonecore_jni.cc
View file

@ -3550,12 +3550,12 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceModelImpl_setActivity(JNIE
/*
* Class: org_linphone_core_PresenceModelImpl
* Method: nbActivities
* Method: getNbActivities
* Signature: (J)J
*/
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_nbActivities(JNIEnv *env, jobject jobj, jlong ptr) {
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_getNbActivities(JNIEnv *env, jobject jobj, jlong ptr) {
LinphonePresenceModel *model = (LinphonePresenceModel *)ptr;
return (jlong)linphone_presence_model_nb_activities(model);
return (jlong)linphone_presence_model_get_nb_activities(model);
}
/*
@ -3630,12 +3630,12 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceModelImpl_clearNotes(JNIEn
/*
* Class: org_linphone_core_PresenceModelImpl
* Method: nbServices
* Method: getNbServices
* Signature: (J)J
*/
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_nbServices(JNIEnv *env, jobject jobj, jlong ptr) {
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_getNbServices(JNIEnv *env, jobject jobj, jlong ptr) {
LinphonePresenceModel *model = (LinphonePresenceModel *)ptr;
return (jlong)linphone_presence_model_nb_services(model);
return (jlong)linphone_presence_model_get_nb_services(model);
}
/*
@ -3671,12 +3671,12 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceModelImpl_clearServices(JN
/*
* Class: org_linphone_core_PresenceModelImpl
* Method: nbPersons
* Method: getNbPersons
* Signature: (J)J
*/
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_nbPersons(JNIEnv *env, jobject jobj, jlong ptr) {
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_getNbPersons(JNIEnv *env, jobject jobj, jlong ptr) {
LinphonePresenceModel *model = (LinphonePresenceModel *)ptr;
return (jlong)linphone_presence_model_nb_persons(model);
return (jlong)linphone_presence_model_get_nb_persons(model);
}
/*
@ -3886,12 +3886,12 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceServiceImpl_setContact(JNI
/*
* Class: org_linphone_core_PresenceServiceImpl
* Method: nbNotes
* Method: getNbNotes
* Signature: (J)J
*/
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceServiceImpl_nbNotes(JNIEnv *env, jobject jobj, jlong ptr) {
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceServiceImpl_getNbNotes(JNIEnv *env, jobject jobj, jlong ptr) {
LinphonePresenceService *service = (LinphonePresenceService *)ptr;
return (jlong)linphone_presence_service_nb_notes(service);
return (jlong)linphone_presence_service_get_nb_notes(service);
}
/*
@ -3975,12 +3975,12 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresencePersonImpl_setId(JNIEnv *e
/*
* Class: org_linphone_core_PresencePersonImpl
* Method: nbActivities
* Method: getNbActivities
* Signature: (J)J
*/
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresencePersonImpl_nbActivities(JNIEnv *env, jobject jobj, jlong ptr) {
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresencePersonImpl_getNbActivities(JNIEnv *env, jobject jobj, jlong ptr) {
LinphonePresencePerson *person = (LinphonePresencePerson *)ptr;
return (jlong)linphone_presence_person_nb_activities(person);
return (jlong)linphone_presence_person_get_nb_activities(person);
}
/*
@ -4016,12 +4016,12 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresencePersonImpl_clearActivities
/*
* Class: org_linphone_core_PresencePersonImpl
* Method: nbNotes
* Method: getNbNotes
* Signature: (J)J
*/
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresencePersonImpl_nbNotes(JNIEnv *env, jobject jobj, jlong ptr) {
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresencePersonImpl_getNbNotes(JNIEnv *env, jobject jobj, jlong ptr) {
LinphonePresencePerson *person = (LinphonePresencePerson *)ptr;
return (jlong)linphone_presence_person_nb_notes(person);
return (jlong)linphone_presence_person_get_nb_notes(person);
}
/*
@ -4057,12 +4057,12 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresencePersonImpl_clearNotes(JNIE
/*
* Class: org_linphone_core_PresencePersonImpl
* Method: nbActivitiesNotes
* Method: getNbActivitiesNotes
* Signature: (J)J
*/
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresencePersonImpl_nbActivitiesNotes(JNIEnv *env, jobject jobj, jlong ptr) {
JNIEXPORT jlong JNICALL Java_org_linphone_core_PresencePersonImpl_getNbActivitiesNotes(JNIEnv *env, jobject jobj, jlong ptr) {
LinphonePresencePerson *person = (LinphonePresencePerson *)ptr;
return (jlong)linphone_presence_person_nb_activities_notes(person);
return (jlong)linphone_presence_person_get_nb_activities_notes(person);
}
/*

14
coreapi/linphonepresence.h
View file

@ -286,7 +286,7 @@ LINPHONE_PUBLIC int linphone_presence_model_set_activity(LinphonePresenceModel *
* @param[in] model The #LinphonePresenceModel object to get the number of activities from.
* @return The number of activities included in the #LinphonePresenceModel object.
*/
LINPHONE_PUBLIC unsigned int linphone_presence_model_nb_activities(const LinphonePresenceModel *model);
LINPHONE_PUBLIC unsigned int linphone_presence_model_get_nb_activities(const LinphonePresenceModel *model);
/**
* Gets the nth activity of a presence model.
@ -357,7 +357,7 @@ LINPHONE_PUBLIC LinphonePresenceModel * linphone_presence_model_new(void);
* @param[in] model The #LinphonePresenceModel object to get the number of services from.
* @return The number of services included in the #LinphonePresenceModel object.
*/
LINPHONE_PUBLIC unsigned int linphone_presence_model_nb_services(const LinphonePresenceModel *model);
LINPHONE_PUBLIC unsigned int linphone_presence_model_get_nb_services(const LinphonePresenceModel *model);
/**
* Gets the nth service of a presence model.
@ -387,7 +387,7 @@ LINPHONE_PUBLIC int linphone_presence_model_clear_services(LinphonePresenceModel
* @param[in] model The #LinphonePresenceModel object to get the number of persons from.
* @return The number of persons included in the #LinphonePresenceModel object.
*/
LINPHONE_PUBLIC unsigned int linphone_presence_model_nb_persons(const LinphonePresenceModel *model);
LINPHONE_PUBLIC unsigned int linphone_presence_model_get_nb_persons(const LinphonePresenceModel *model);
/**
* Gets the nth person of a presence model.
@ -482,7 +482,7 @@ LINPHONE_PUBLIC int linphone_presence_service_set_contact(LinphonePresenceServic
* @param[in] service The #LinphonePresenceService object to get the number of notes from.
* @return The number of notes included in the #LinphonePresenceService object.
*/
LINPHONE_PUBLIC unsigned int linphone_presence_service_nb_notes(const LinphonePresenceService *service);
LINPHONE_PUBLIC unsigned int linphone_presence_service_get_nb_notes(const LinphonePresenceService *service);
/**
* Gets the nth note of a presence service.
@ -541,7 +541,7 @@ LINPHONE_PUBLIC int linphone_presence_person_set_id(LinphonePresencePerson *pers
* @param[in] person The #LinphonePresencePerson object to get the number of activities from.
* @return The number of activities included in the #LinphonePresencePerson object.
*/
LINPHONE_PUBLIC unsigned int linphone_presence_person_nb_activities(const LinphonePresencePerson *person);
LINPHONE_PUBLIC unsigned int linphone_presence_person_get_nb_activities(const LinphonePresencePerson *person);
/**
* Gets the nth activity of a presence person.
@ -571,7 +571,7 @@ LINPHONE_PUBLIC int linphone_presence_person_clear_activities(LinphonePresencePe
* @param[in] person The #LinphonePresencePerson object to get the number of notes from.
* @return The number of notes included in the #LinphonePresencePerson object.
*/
LINPHONE_PUBLIC unsigned int linphone_presence_person_nb_notes(const LinphonePresencePerson *person);
LINPHONE_PUBLIC unsigned int linphone_presence_person_get_nb_notes(const LinphonePresencePerson *person);
/**
* Gets the nth note of a presence person.
@ -601,7 +601,7 @@ LINPHONE_PUBLIC int linphone_presence_person_clear_notes(LinphonePresencePerson
* @param[in] person The #LinphonePresencePerson object to get the number of activities notes from.
* @return The number of activities notes included in the #LinphonePresencePerson object.
*/
LINPHONE_PUBLIC unsigned int linphone_presence_person_nb_activities_notes(const LinphonePresencePerson *person);
LINPHONE_PUBLIC unsigned int linphone_presence_person_get_nb_activities_notes(const LinphonePresencePerson *person);
/**
* Gets the nth activities note of a presence person.

28
coreapi/presence.c
View file

@ -435,7 +435,7 @@ int linphone_presence_model_set_activity(LinphonePresenceModel *model, LinphoneP
}
unsigned int linphone_presence_model_nb_activities(const LinphonePresenceModel *model) {
unsigned int linphone_presence_model_get_nb_activities(const LinphonePresenceModel *model) {
unsigned int nb = 0;
ms_list_for_each2(model->persons, (MSIterate2Func)presence_model_count_activities, &nb);
return nb;
@ -444,7 +444,7 @@ unsigned int linphone_presence_model_nb_activities(const LinphonePresenceModel *
LinphonePresenceActivity * linphone_presence_model_get_nth_activity(const LinphonePresenceModel *model, unsigned int idx) {
struct _get_activity_st st;
if ((model == NULL) || (idx >= linphone_presence_model_nb_activities(model)))
if ((model == NULL) || (idx >= linphone_presence_model_get_nb_activities(model)))
return NULL;
memset(&st, 0, sizeof(st));
@ -651,12 +651,12 @@ LinphonePresenceModel * linphone_presence_model_new(void) {
return model;
}
unsigned int linphone_presence_model_nb_services(const LinphonePresenceModel *model) {
unsigned int linphone_presence_model_get_nb_services(const LinphonePresenceModel *model) {
return ms_list_size(model->services);
}
LinphonePresenceService * linphone_presence_model_get_nth_service(const LinphonePresenceModel *model, unsigned int idx) {
if ((model == NULL) || (idx >= linphone_presence_model_nb_services(model)))
if ((model == NULL) || (idx >= linphone_presence_model_get_nb_services(model)))
return NULL;
return (LinphonePresenceService *)ms_list_nth_data(model->services, idx);
@ -677,12 +677,12 @@ int linphone_presence_model_clear_services(LinphonePresenceModel *model) {
return 0;
}
unsigned int linphone_presence_model_nb_persons(const LinphonePresenceModel *model) {
unsigned int linphone_presence_model_get_nb_persons(const LinphonePresenceModel *model) {
return ms_list_size(model->persons);
}
LinphonePresencePerson * linphone_presence_model_get_nth_person(const LinphonePresenceModel *model, unsigned int idx) {
if ((model == NULL) || (idx >= linphone_presence_model_nb_persons(model)))
if ((model == NULL) || (idx >= linphone_presence_model_get_nb_persons(model)))
return NULL;
return (LinphonePresencePerson *)ms_list_nth_data(model->persons, idx);
@ -766,12 +766,12 @@ int linphone_presence_service_set_contact(LinphonePresenceService *service, cons
return 0;
}
unsigned int linphone_presence_service_nb_notes(const LinphonePresenceService *service) {
unsigned int linphone_presence_service_get_nb_notes(const LinphonePresenceService *service) {
return ms_list_size(service->notes);
}
LinphonePresenceNote * linphone_presence_service_get_nth_note(const LinphonePresenceService *service, unsigned int idx) {
if ((service == NULL) || (idx >= linphone_presence_service_nb_notes(service)))
if ((service == NULL) || (idx >= linphone_presence_service_get_nb_notes(service)))
return NULL;
return (LinphonePresenceNote *)ms_list_nth_data(service->notes, idx);
@ -818,13 +818,13 @@ int linphone_presence_person_set_id(LinphonePresencePerson *person, const char *
return 0;
}
unsigned int linphone_presence_person_nb_activities(const LinphonePresencePerson *person) {
unsigned int linphone_presence_person_get_nb_activities(const LinphonePresencePerson *person) {
if (person == NULL) return 0;
return ms_list_size(person->activities);
}
LinphonePresenceActivity * linphone_presence_person_get_nth_activity(const LinphonePresencePerson *person, unsigned int idx) {
if ((person == NULL) || (idx >= linphone_presence_person_nb_activities(person)))
if ((person == NULL) || (idx >= linphone_presence_person_get_nb_activities(person)))
return NULL;
return (LinphonePresenceActivity *)ms_list_nth_data(person->activities, idx);
}
@ -843,13 +843,13 @@ int linphone_presence_person_clear_activities(LinphonePresencePerson *person) {
return 0;
}
unsigned int linphone_presence_person_nb_notes(const LinphonePresencePerson *person) {
unsigned int linphone_presence_person_get_nb_notes(const LinphonePresencePerson *person) {
if (person == NULL) return 0;
return ms_list_size(person->notes);
}
LinphonePresenceNote * linphone_presence_person_get_nth_note(const LinphonePresencePerson *person, unsigned int idx) {
if ((person == NULL) || (idx >= linphone_presence_person_nb_notes(person)))
if ((person == NULL) || (idx >= linphone_presence_person_get_nb_notes(person)))
return NULL;
return (LinphonePresenceNote *)ms_list_nth_data(person->notes, idx);
}
@ -868,13 +868,13 @@ int linphone_presence_person_clear_notes(LinphonePresencePerson *person) {
return 0;
}
unsigned int linphone_presence_person_nb_activities_notes(const LinphonePresencePerson *person) {
unsigned int linphone_presence_person_get_nb_activities_notes(const LinphonePresencePerson *person) {
if (person == NULL) return 0;
return ms_list_size(person->activities_notes);
}
LinphonePresenceNote * linphone_presence_person_get_nth_activities_note(const LinphonePresencePerson *person, unsigned int idx) {
if ((person == NULL) || (idx >= linphone_presence_person_nb_activities_notes(person)))
if ((person == NULL) || (idx >= linphone_presence_person_get_nb_activities_notes(person)))
return NULL;
return (LinphonePresenceNote *)ms_list_nth_data(person->activities_notes, idx);
}

6
java/common/org/linphone/core/PresenceModel.java
View file

@ -73,7 +73,7 @@ public interface PresenceModel {
* @brief Gets the number of activities included in the presence model.
* @return The number of activities included in the #PresenceModel object.
*/
long nbActivities();
long getNbActivities();
/**
* @brief Gets the nth activity of a presence model.
@ -122,7 +122,7 @@ public interface PresenceModel {
* @brief Gets the number of services included in the presence model.
* @return The number of services included in the #PresenceModel object.
*/
long nbServices();
long getNbServices();
/**
* @brief Gets the nth service of a presence model.
@ -148,7 +148,7 @@ public interface PresenceModel {
* @brief Gets the number of persons included in the presence model.
* @return The number of persons included in the #PresenceModel object.
*/
long nbPersons();
long getNbPersons();
/**
* @brief Gets the nth person of a presence model.

6
java/common/org/linphone/core/PresencePerson.java
View file

@ -38,7 +38,7 @@ public interface PresencePerson {
* @brief Gets the number of activities included in the presence person.
* @return The number of activities included in the #PresencePerson object.
*/
long nbActivities();
long getNbActivities();
/**
* @brief Gets the nth activity of a presence person.
@ -64,7 +64,7 @@ public interface PresencePerson {
* @brief Gets the number of notes included in the presence person.
* @return The number of notes included in the #PresencePerson object.
*/
long nbNotes();
long getNbNotes();
/**
* @brief Gets the nth note of a presence person.
@ -90,7 +90,7 @@ public interface PresencePerson {
* @brief Gets the number of activities notes included in the presence person.
* @return The number of activities notes included in the #PresencePerson object.
*/
long nbActivitiesNotes();
long getNbActivitiesNotes();
/**
* @brief Gets the nth activities note of a presence person.

2
java/common/org/linphone/core/PresenceService.java
View file

@ -64,7 +64,7 @@ public interface PresenceService {
* @brief Gets the number of notes included in the presence service.
* @return The number of notes included in the #PresenceService object.
*/
long nbNotes();
long getNbNotes();
/**
* @brief Gets the nth note of a presence service.

18
java/impl/org/linphone/core/PresenceModelImpl.java
View file

@ -88,10 +88,10 @@ public class PresenceModelImpl implements PresenceModel {
return setActivity(mNativePtr, activity.toInt(), description);
}
private native long nbActivities(long nativePtr);
private native long getNbActivities(long nativePtr);
@Override
public long nbActivities() {
return nbActivities(mNativePtr);
public long getNbActivities() {
return getNbActivities(mNativePtr);
}
private native Object getNthActivity(long nativePtr, long idx);
@ -130,10 +130,10 @@ public class PresenceModelImpl implements PresenceModel {
return clearNotes(mNativePtr);
}
private native long nbServices(long nativePtr);
private native long getNbServices(long nativePtr);
@Override
public long nbServices() {
return nbServices(mNativePtr);
public long getNbServices() {
return getNbServices(mNativePtr);
}
private native Object getNthService(long nativePtr, long idx);
@ -154,10 +154,10 @@ public class PresenceModelImpl implements PresenceModel {
return clearServices(mNativePtr);
}
private native long nbPersons(long nativePtr);
private native long getNbPersons(long nativePtr);
@Override
public long nbPersons() {
return nbPersons(mNativePtr);
public long getNbPersons() {
return getNbPersons(mNativePtr);
}
private native Object getNthPerson(long nativePtr, long idx);

18
java/impl/org/linphone/core/PresencePersonImpl.java
View file

@ -48,10 +48,10 @@ public class PresencePersonImpl implements PresencePerson {
return setId(mNativePtr, id);
}
private native long nbActivities(long nativePtr);
private native long getNbActivities(long nativePtr);
@Override
public long nbActivities() {
return nbActivities(mNativePtr);
public long getNbActivities() {
return getNbActivities(mNativePtr);
}
private native Object getNthActivity(long nativePtr, long idx);
@ -72,10 +72,10 @@ public class PresencePersonImpl implements PresencePerson {
return clearActivities(mNativePtr);
}
private native long nbNotes(long nativePtr);
private native long getNbNotes(long nativePtr);
@Override
public long nbNotes() {
return nbNotes(mNativePtr);
public long getNbNotes() {
return getNbNotes(mNativePtr);
}
private native Object getNthNote(long nativePtr, long idx);
@ -96,10 +96,10 @@ public class PresencePersonImpl implements PresencePerson {
return clearNotes(mNativePtr);
}
private native long nbActivitiesNotes(long nativePtr);
private native long getNbActivitiesNotes(long nativePtr);
@Override
public long nbActivitiesNotes() {
return nbActivitiesNotes(mNativePtr);
public long getNbActivitiesNotes() {
return getNbActivitiesNotes(mNativePtr);
}
private native Object getNthActivitiesNote(long nativePtr, long idx);

6
java/impl/org/linphone/core/PresenceServiceImpl.java
View file

@ -72,10 +72,10 @@ public class PresenceServiceImpl implements PresenceService {
return setContact(mNativePtr, contact);
}
private native long nbNotes(long nativePtr);
private native long getNbNotes(long nativePtr);
@Override
public long nbNotes() {
return nbNotes(mNativePtr);
public long getNbNotes() {
return getNbNotes(mNativePtr);
}
private native Object getNthNote(long nativePtr, long idx);