[PATCH] libqmi-glib: make gtk-doc work again on deprecated enumerators
Aleksander Morgado
aleksander at aleksander.es
Wed Jun 28 15:23:40 UTC 2017
On Wed, Jun 28, 2017 at 4:44 PM, Ben Chan <benchan at chromium.org> wrote:
> Commit c96725e7e "libqmi-glib: fix G_DEPRECATED_FOR annotations"
> replaced macro defintions with `static const int' definitions for those
> deprecated enumerators. However, gtk-doc doesn't seem to document
> `static const int' defintions. This patch works around the issue by
> adding a macro defintion on top of a `static const int' defintion.
Could we make it QMI_DEPRECATED_...? i.e. to keep the QMI_ prefix.
> ---
> src/libqmi-glib/qmi-compat.h | 87 +++++++++++++++++++++++++++++---------------
> 1 file changed, 58 insertions(+), 29 deletions(-)
>
> diff --git a/src/libqmi-glib/qmi-compat.h b/src/libqmi-glib/qmi-compat.h
> index 6bf1f01..fe842c7 100644
> --- a/src/libqmi-glib/qmi-compat.h
> +++ b/src/libqmi-glib/qmi-compat.h
> @@ -124,8 +124,9 @@ gboolean qmi_message_dms_set_service_programming_code_input_set_current (
> * Deprecated: 1.14.0: Use the correct #QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE name instead.
> */
> G_DEPRECATED_FOR (QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE)
> -static const int QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE =
> +static const int DEPRECATED_QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE =
> QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE;
> +#define QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE DEPRECATED_QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT:
> @@ -136,8 +137,9 @@ static const int QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT =
> QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT;
> +#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE:
> @@ -148,8 +150,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE =
> QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE;
> +#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE:
> @@ -160,8 +163,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE =
> QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE;
> +#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE:
> @@ -172,8 +176,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE =
> QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE;
> +#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID:
> @@ -184,8 +189,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID =
> QMI_WMS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID;
> +#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER:
> @@ -196,8 +202,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER =
> QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER;
> +#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE:
> @@ -208,8 +215,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE =
> QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE;
> +#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY:
> @@ -220,8 +228,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY =
> QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY;
> +#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK:
> @@ -232,8 +241,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK =
> QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK;
> +#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK
>
>
> /**
> @@ -245,8 +255,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE =
> QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE;
> +#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED:
> @@ -257,8 +268,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED =
> QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED;
> +#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE:
> @@ -269,8 +281,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE =
> QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE;
> +#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS:
> @@ -281,8 +294,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS =
> QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS;
> +#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER:
> @@ -293,8 +307,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER =
> QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER;
> +#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE:
> @@ -305,8 +320,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE =
> QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE;
> +#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY:
> @@ -317,8 +333,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY =
> QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY;
> +#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER:
> @@ -329,8 +346,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER =
> QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER;
> +#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING:
> @@ -341,8 +359,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED:
> @@ -353,8 +372,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED:
> @@ -365,8 +385,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED:
> @@ -377,8 +398,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED:
> @@ -389,8 +411,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPO
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_SMS_NOT_SUPPORTED)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER:
> @@ -401,8 +424,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER:
> @@ -413,8 +437,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE:
> @@ -425,8 +450,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE:
> @@ -437,8 +463,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR:
> @@ -449,8 +476,9 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR
>
> /**
> * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER:
> @@ -461,7 +489,8 @@ static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR =
> * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_OTHER name instead.
> */
> G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_OTHER)
> -static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER =
> +static const int DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER =
> QMI_WMS_CDMA_CAUSE_CODE_GENERAL_OTHER;
> +#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER DEPRECATED_QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER
>
> #endif /* _LIBQMI_GLIB_QMI_COMPAT_H_ */
> --
> 2.13.2.725.g09c95d1e9-goog
>
--
Aleksander
https://aleksander.es
More information about the libqmi-devel
mailing list