diff -r e863583e6720 -r c23bdf5a328a eapol/eapol_framework/eapol_symbian/am/include/EapConversion.h --- a/eapol/eapol_framework/eapol_symbian/am/include/EapConversion.h Fri Sep 17 08:30:11 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/include/EapConversion.h Mon Oct 04 00:19:54 2010 +0300 @@ -29,6 +29,29 @@ #include "eap_method_settings.h" #include "EapExpandedType.h" #include "EapSettings.h" +#include "eap_am_export.h" +// Start: added by script change_export_macros.sh. +#if defined(EAP_NO_EXPORT_EAPCONVERSION_H) + #define EAP_CLASS_VISIBILITY_EAPCONVERSION_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_EAPCONVERSION_H + #define EAP_C_FUNC_VISIBILITY_EAPCONVERSION_H + #define EAP_FUNC_EXPORT_EAPCONVERSION_H + #define EAP_C_FUNC_EXPORT_EAPCONVERSION_H +#elif defined(EAP_EXPORT_EAPCONVERSION_H) + #define EAP_CLASS_VISIBILITY_EAPCONVERSION_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_EAPCONVERSION_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_EAPCONVERSION_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_EAPCONVERSION_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_EAPCONVERSION_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_EAPCONVERSION_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_EAPCONVERSION_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_EAPCONVERSION_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_EAPCONVERSION_H + #define EAP_C_FUNC_EXPORT_EAPCONVERSION_H +#endif +// End: added by script change_export_macros.sh. + // FORWARD DECLARATIONS @@ -37,99 +60,99 @@ /** * Class that implements the conversion functions for EAP type interface. */ -class EAP_EXPORT CEapConversion +class EAP_CLASS_VISIBILITY_EAPCONVERSION_H CEapConversion { public: - EAP_FUNC_IMPORT static TInt ConvertFromTDesCToInternal( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertFromTDesCToInternal( abs_eap_am_tools_c * const tools, const TDesC & input16, eap_variable_data_c * const target8); - EAP_FUNC_IMPORT static TInt ConvertFromInternalToBuf16( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertFromInternalToBuf16( abs_eap_am_tools_c * const tools, const eap_variable_data_c * const input8, TDes * const target16); - EAP_FUNC_IMPORT static TInt ConvertFromBuf16ToInternal( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertFromBuf16ToInternal( abs_eap_am_tools_c * const tools, const TDes * const input16, eap_variable_data_c * const target8); - EAP_FUNC_IMPORT static TInt ConvertEAPTypesToInternalTypes( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertEAPTypesToInternalTypes( abs_eap_am_tools_c * const tools, const RArray * const EncapsulatedEAPTypes, eap_array_c * const target); - EAP_FUNC_IMPORT static TInt ConvertInternalTypesToEAPTypes( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertInternalTypesToEAPTypes( abs_eap_am_tools_c * const tools, const eap_array_c * const source, RArray * const EncapsulatedEAPTypes); - EAP_FUNC_IMPORT static TInt ConvertExpandedEAPTypeToInternalType( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertExpandedEAPTypeToInternalType( const TEapExpandedType * const EncapsulatedExpandedEAPType, eap_type_value_e * const target); - EAP_FUNC_IMPORT static TInt ConvertInternalTypeToExpandedEAPType( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertInternalTypeToExpandedEAPType( const eap_type_value_e * const source, TEapExpandedType * const EncapsulatedExpandedEAPType); - EAP_FUNC_IMPORT static TInt ConvertExpandedEAPTypesToInternalTypes( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertExpandedEAPTypesToInternalTypes( abs_eap_am_tools_c * const tools, const RArray * const EncapsulatedExpandedEAPTypes, eap_array_c * const target); - EAP_FUNC_IMPORT static TInt ConvertInternalTypesToExpandedEAPTypes( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertInternalTypesToExpandedEAPTypes( abs_eap_am_tools_c * const tools, const eap_array_c * const source, RArray * const EncapsulatedExpandedEAPTypes); - EAP_FUNC_IMPORT static TInt ConvertInternalTypesToHBufC8( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertInternalTypesToHBufC8( abs_eap_am_tools_c * const tools, const eap_array_c * const source, HBufC8 ** const EncapsulatedExpandedEAPTypesData); - EAP_FUNC_IMPORT static TInt ConvertHBufC8ToInternalTypes( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertHBufC8ToInternalTypes( abs_eap_am_tools_c * const tools, const HBufC8 * const EncapsulatedExpandedEAPTypesData, eap_array_c * const target); - EAP_FUNC_IMPORT static TInt ConvertCipherSuitesToInternalType( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertCipherSuitesToInternalType( abs_eap_am_tools_c * const tools, const RArray * const aCipherSuites, eap_array_c * const internal_cipher_suites); - EAP_FUNC_IMPORT static TInt ConvertInternalTypeToCipherSuites( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertInternalTypeToCipherSuites( abs_eap_am_tools_c * const tools, const eap_array_c * const internal_cipher_suites, RArray * const aCipherSuites); - EAP_FUNC_IMPORT static TInt ConvertCertificatesToInternalType( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertCertificatesToInternalType( abs_eap_am_tools_c * const tools, const RPointerArray * const aCertificates, eap_array_c * const internal_certificates); - EAP_FUNC_IMPORT static TInt ConvertInternalTypeToCertificates( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertInternalTypeToCertificates( abs_eap_am_tools_c * const tools, const eap_certificate_entry_c::eap_certificate_type_e select_certificate_type, const eap_array_c * const internal_certificates, RPointerArray * const aCertificates); - EAP_FUNC_IMPORT static TInt ConvertEAPSettingsToInternalType( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertEAPSettingsToInternalType( abs_eap_am_tools_c * const tools, const EAPSettings * const aSettings, eap_method_settings_c * const internal_settings); - EAP_FUNC_IMPORT static TInt ConvertInternalTypeToEAPSettings( + EAP_FUNC_VISIBILITY_EAPCONVERSION_H static TInt ConvertInternalTypeToEAPSettings( abs_eap_am_tools_c * const tools, const eap_method_settings_c * const internal_settings, EAPSettings * const aSettings);