From d10ab0a250f311eded2b1cb5a00bf614fd176dc6 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 7 Oct 2013 11:20:04 +0200 Subject: [PATCH] Getter functions need to start with "get". --- coreapi/friend.c | 2 +- coreapi/linphonecore_jni.cc | 42 +++++++++---------- coreapi/linphonepresence.h | 14 +++---- coreapi/presence.c | 28 ++++++------- .../org/linphone/core/PresenceModel.java | 6 +-- .../org/linphone/core/PresencePerson.java | 6 +-- .../org/linphone/core/PresenceService.java | 2 +- .../org/linphone/core/PresenceModelImpl.java | 18 ++++---- .../org/linphone/core/PresencePersonImpl.java | 18 ++++---- .../linphone/core/PresenceServiceImpl.java | 6 +-- 10 files changed, 71 insertions(+), 71 deletions(-) diff --git a/coreapi/friend.c b/coreapi/friend.c index 8493cda88..5e48b227e 100644 --- a/coreapi/friend.c +++ b/coreapi/friend.c @@ -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; diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 7a587ce83..23d32d13b 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -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); } /* diff --git a/coreapi/linphonepresence.h b/coreapi/linphonepresence.h index 6973c6eca..b4e220e9d 100644 --- a/coreapi/linphonepresence.h +++ b/coreapi/linphonepresence.h @@ -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. diff --git a/coreapi/presence.c b/coreapi/presence.c index 877a1e3e7..1db9697ae 100644 --- a/coreapi/presence.c +++ b/coreapi/presence.c @@ -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); } diff --git a/java/common/org/linphone/core/PresenceModel.java b/java/common/org/linphone/core/PresenceModel.java index b225e6606..78bc264c2 100644 --- a/java/common/org/linphone/core/PresenceModel.java +++ b/java/common/org/linphone/core/PresenceModel.java @@ -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. diff --git a/java/common/org/linphone/core/PresencePerson.java b/java/common/org/linphone/core/PresencePerson.java index 0e9822a60..730aafe77 100644 --- a/java/common/org/linphone/core/PresencePerson.java +++ b/java/common/org/linphone/core/PresencePerson.java @@ -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. diff --git a/java/common/org/linphone/core/PresenceService.java b/java/common/org/linphone/core/PresenceService.java index 082f7d5fd..3e06b6774 100644 --- a/java/common/org/linphone/core/PresenceService.java +++ b/java/common/org/linphone/core/PresenceService.java @@ -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. diff --git a/java/impl/org/linphone/core/PresenceModelImpl.java b/java/impl/org/linphone/core/PresenceModelImpl.java index 30cc4751e..b70ab6bd5 100644 --- a/java/impl/org/linphone/core/PresenceModelImpl.java +++ b/java/impl/org/linphone/core/PresenceModelImpl.java @@ -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); diff --git a/java/impl/org/linphone/core/PresencePersonImpl.java b/java/impl/org/linphone/core/PresencePersonImpl.java index ab4d85ceb..7b7a336ac 100644 --- a/java/impl/org/linphone/core/PresencePersonImpl.java +++ b/java/impl/org/linphone/core/PresencePersonImpl.java @@ -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); diff --git a/java/impl/org/linphone/core/PresenceServiceImpl.java b/java/impl/org/linphone/core/PresenceServiceImpl.java index bbca443ab..29cd930e4 100644 --- a/java/impl/org/linphone/core/PresenceServiceImpl.java +++ b/java/impl/org/linphone/core/PresenceServiceImpl.java @@ -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);