api: don't use intermediate variables for deprecation warnings

Using an intermediate constant variable breaks compilation with C
compilers, as these variables cannot be used as initializers.

Instead, define a deprecated type and cast all deprecated symbols to
that type. We lose the information about what the new replacement
symbol is, but we don't break compilation.

Also, add QMI_DISABLE_DEPRECATED guards around deprecated symbols. So
that when this symbol is defined, e.g. via CFLAGS, building a program
that uses the libmbim API will fail if the program references
deprecated symbols. For now we just use it to keep gtk-doc-scan happy
and avoid unnecessary warnings.

Equivalent to ModemManager commits eedd4ab4457 and f0bb6ef856.

(cherry picked from commit ca39b63c68346f019e8aa5ecf2505e645e921532)

4 files changed, 49 insertions, 117 deletions

diff --git a/docs/reference/libqmi-glib/Makefile.am b/docs/reference/libqmi-glib/Makefile.am
index 6f5cfd1..9f2d2a2 100644
--- a/docs/reference/libqmi-glib/Makefile.am
+++ b/docs/reference/libqmi-glib/Makefile.am
@@ -29,7 +29,7 @@ $(DOC_MODULE)-sections.mstamp: $(ALL_SECTIONS)
 BUILT_SOURCES = $(DOC_MODULE)-sections.mstamp
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS = --rebuild-types
+SCAN_OPTIONS = --rebuild-types --deprecated-guards="QMI_DISABLE_DEPRECATED"
 
 # The directory containing the source code.
 DOC_SOURCE_DIR = \
diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections
index 9950b40..a75dd70 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections
+++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections
@@ -1221,4 +1221,7 @@ QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE
 QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE
 QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR
 QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER
+<SUBSECTION Private>
+QmiDeprecatedNasSimRejectState
+QmiDeprecatedWdsCdmaCauseCode
 </SECTION>
diff --git a/src/libqmi-glib/qmi-compat.c b/src/libqmi-glib/qmi-compat.c
index 85df972..dffde54 100644
--- a/src/libqmi-glib/qmi-compat.c
+++ b/src/libqmi-glib/qmi-compat.c
@@ -21,6 +21,8 @@
 
 #include "qmi-compat.h"
 
+#ifndef QMI_DISABLE_DEPRECATED
+
 gboolean
 qmi_message_dms_set_service_programming_code_input_get_new (
     QmiMessageDmsSetServiceProgrammingCodeInput *self,
@@ -56,3 +58,5 @@ qmi_message_dms_set_service_programming_code_input_set_current (
 {
   return qmi_message_dms_set_service_programming_code_input_set_current_code (self, arg_current, error);
 }
+
+#endif /* QMI_DISABLE_DEPRECATED */
diff --git a/src/libqmi-glib/qmi-compat.h b/src/libqmi-glib/qmi-compat.h
index a262104..e577d45 100644
--- a/src/libqmi-glib/qmi-compat.h
+++ b/src/libqmi-glib/qmi-compat.h
@@ -39,6 +39,8 @@
  * innecessary API/ABI breaks.
  */
 
+#ifndef QMI_DISABLE_DEPRECATED
+
 /**
  * qmi_message_dms_set_service_programming_code_input_get_new:
  * @self: a #QmiMessageDmsSetServiceProgrammingCodeInput.
@@ -115,6 +117,10 @@ gboolean qmi_message_dms_set_service_programming_code_input_set_current (
     const gchar *arg_current,
     GError **error);
 
+/* The following type exists just so that we can get deprecation warnings */
+G_DEPRECATED
+typedef int QmiDeprecatedNasSimRejectState;
+
 /**
  * QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE:
  *
@@ -123,10 +129,11 @@ gboolean qmi_message_dms_set_service_programming_code_input_set_current (
  * Since: 1.0
  * 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_DEPRECATED_NAS_SIM_REJECT_STATE_SIM_VAILABLE =
-    QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE;
-#define QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE QMI_DEPRECATED_NAS_SIM_REJECT_STATE_SIM_VAILABLE
+#define QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE (QmiDeprecatedNasSimRejectState) QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE
+
+/* The following type exists just so that we can get deprecation warnings */
+G_DEPRECATED
+typedef int QmiDeprecatedWdsCdmaCauseCode;
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT:
@@ -136,10 +143,7 @@ static const int QMI_DEPRECATED_NAS_SIM_REJECT_STATE_SIM_VAILABLE =
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT =
-    QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT;
-#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT
+#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE:
@@ -149,10 +153,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT =
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE
+#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE:
@@ -162,10 +163,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE =
-    QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE;
-#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE
+#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE:
@@ -175,10 +173,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE =
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE =
-    QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE;
-#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE
+#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID:
@@ -188,10 +183,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE =
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID
+#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER:
@@ -201,10 +193,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER =
-    QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER;
-#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER
+#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE:
@@ -214,10 +203,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER =
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE
+#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY:
@@ -227,10 +213,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY =
-    QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY;
-#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY
+#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK:
@@ -240,10 +223,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY =
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK =
-    QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK;
-#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK
+#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK
 
 
 /**
@@ -254,10 +234,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK =
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE =
-    QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE;
-#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE
+#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED:
@@ -267,10 +244,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAG
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED
+#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE:
@@ -280,10 +254,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POS
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE
+#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS:
@@ -293,10 +264,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE =
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS
+#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER:
@@ -306,10 +274,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS =
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER =
-    QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER;
-#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER
+#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE:
@@ -319,10 +284,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER =
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE
+#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY:
@@ -332,10 +294,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHO
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY =
-    QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY;
-#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY
+#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER:
@@ -345,10 +304,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBIL
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER =
-    QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER;
-#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER
+#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING:
@@ -358,10 +314,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER =
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING =
-    QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING;
-#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED:
@@ -371,10 +324,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING =
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED:
@@ -384,10 +334,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED =
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED:
@@ -397,10 +344,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENI
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED:
@@ -410,10 +354,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVIC
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER:
@@ -423,10 +364,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED =
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER:
@@ -436,10 +374,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PAR
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE:
@@ -449,10 +384,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PA
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE:
@@ -462,10 +394,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMET
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR:
@@ -475,10 +404,7 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER
  * Since: 1.0
  * 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_DEPRECATED_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 QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR
 
 /**
  * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER:
@@ -488,9 +414,8 @@ static const int QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR
  * Since: 1.0
  * 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_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER =
-    QMI_WMS_CDMA_CAUSE_CODE_GENERAL_OTHER;
-#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER QMI_DEPRECATED_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER
+#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER (QmiDeprecatedWdsCdmaCauseCode) QMI_WMS_CDMA_CAUSE_CODE_GENERAL_OTHER
+
+#endif /* QMI_DISABLE_DEPRECATED */
 
 #endif /* _LIBQMI_GLIB_QMI_COMPAT_H_ */