diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2017-03-01 00:21:54 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-03-01 00:51:42 +0100 |
| commit | 8cb979ec4c4cc52c3de34a9fff22a0f53a796074 (patch) | |
| tree | 5feb9a7e6d54f2c69de10751f9a2a70df36f3a51 | |
| parent | 5f4d95f1aba7ff6d0c4d5cc1cb972219a3749d02 (diff) | |
| download | external_libqmi-8cb979ec4c4cc52c3de34a9fff22a0f53a796074.zip external_libqmi-8cb979ec4c4cc52c3de34a9fff22a0f53a796074.tar.gz external_libqmi-8cb979ec4c4cc52c3de34a9fff22a0f53a796074.tar.bz2 | |
libqmi-glib: fix enum nicknames with '3gpp' on it
| -rw-r--r-- | build-aux/qmi-codegen/utils.py | 3 | ||||
| -rw-r--r-- | docs/reference/libqmi-glib/libqmi-glib-common.sections | 16 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-wds.h | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/build-aux/qmi-codegen/utils.py b/build-aux/qmi-codegen/utils.py index b490c6f..a4044dd 100644 --- a/build-aux/qmi-codegen/utils.py +++ b/build-aux/qmi-codegen/utils.py @@ -163,7 +163,8 @@ e.g.: "ThisIsAMessage" --> "this_is_a_message" """ def build_underscore_name_from_camelcase(camelcase): s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', camelcase) - return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower() + s2 = re.sub('(.)([0-9][a-z]+)', r'\1_\2', s1) + return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s2).lower() """ diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections index a13403a..9950b40 100644 --- a/docs/reference/libqmi-glib/libqmi-glib-common.sections +++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections @@ -558,8 +558,8 @@ qmi_wds_data_call_status_get_string qmi_wds_data_call_type_get_string qmi_wds_data_system_get_string qmi_wds_dormancy_status_get_string -qmi_wds_extended_data_bearer_technology3gpp2_get_string -qmi_wds_extended_data_bearer_technology3gpp_get_string +qmi_wds_extended_data_bearer_technology_3gpp2_get_string +qmi_wds_extended_data_bearer_technology_3gpp_get_string qmi_wds_radio_access_technology_get_string qmi_wds_set_event_report_transfer_statistics_get_string qmi_wds_so_evdo_rev0_get_string @@ -608,8 +608,8 @@ qmi_wds_data_call_status_build_string_from_mask qmi_wds_data_call_type_build_string_from_mask qmi_wds_data_system_build_string_from_mask qmi_wds_dormancy_status_build_string_from_mask -qmi_wds_extended_data_bearer_technology3gpp2_build_string_from_mask -qmi_wds_extended_data_bearer_technology3gpp_build_string_from_mask +qmi_wds_extended_data_bearer_technology_3gpp2_build_string_from_mask +qmi_wds_extended_data_bearer_technology_3gpp_build_string_from_mask qmi_wds_radio_access_technology_build_string_from_mask qmi_wds_set_event_report_transfer_statistics_build_string_from_mask qmi_wds_so_evdo_rev0_build_string_from_mask @@ -658,8 +658,8 @@ QMI_TYPE_WDS_DATA_CALL_STATUS QMI_TYPE_WDS_DATA_CALL_TYPE QMI_TYPE_WDS_DATA_SYSTEM QMI_TYPE_WDS_DORMANCY_STATUS -QMI_TYPE_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY3GPP -QMI_TYPE_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY3GPP2 +QMI_TYPE_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY_3GPP +QMI_TYPE_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY_3GPP2 QMI_TYPE_WDS_RADIO_ACCESS_TECHNOLOGY QMI_TYPE_WDS_SET_EVENT_REPORT_TRANSFER_STATISTICS QMI_TYPE_WDS_SO_EVDO_REV0 @@ -707,8 +707,8 @@ qmi_wds_data_call_status_get_type qmi_wds_data_call_type_get_type qmi_wds_data_system_get_type qmi_wds_dormancy_status_get_type -qmi_wds_extended_data_bearer_technology3gpp2_get_type -qmi_wds_extended_data_bearer_technology3gpp_get_type +qmi_wds_extended_data_bearer_technology_3gpp2_get_type +qmi_wds_extended_data_bearer_technology_3gpp_get_type qmi_wds_radio_access_technology_get_type qmi_wds_set_event_report_transfer_statistics_get_type qmi_wds_so_evdo_rev0_get_type diff --git a/src/libqmi-glib/qmi-enums-wds.h b/src/libqmi-glib/qmi-enums-wds.h index 6f75812..1b9af9f 100644 --- a/src/libqmi-glib/qmi-enums-wds.h +++ b/src/libqmi-glib/qmi-enums-wds.h @@ -1749,7 +1749,7 @@ typedef enum { * * Since: 1.18 */ -typedef enum { +typedef enum { /*< underscore_name=qmi_wds_extended_data_bearer_technology_3gpp >*/ QMI_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY_3GPP_UNKNOWN = 0, QMI_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY_3GPP_WCDMA = 1 << 0, QMI_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY_3GPP_HSDPA = 1 << 1, @@ -1794,7 +1794,7 @@ typedef enum { * * Since: 1.18 */ -typedef enum { +typedef enum { /*< underscore_name=qmi_wds_extended_data_bearer_technology_3gpp2 >*/ QMI_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY_3GPP2_UNKNOWN = 0, QMI_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY_3GPP2_RESERVED = 1 << 0, QMI_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY_3GPP2_CDMA1X_IS95 = 1 << 1, |