From b7cbfe7bfe892c533e0d0c51a1360ae2c2309d27 Mon Sep 17 00:00:00 2001 From: Jaehwan Lee Date: Wed, 20 Mar 2013 14:59:43 +0900 Subject: [PATCH] [Doxygen] Merge LB's review comment. Change-Id: Ibdae935172eda9b94d6c2c2633c7f6cf199db936 Signed-off-by: Jaehwan Lee --- inc/FNetWifiIWifiDirectDeviceListener.h | 4 ++-- inc/FNetWifiIWifiDirectGroupClientListener.h | 6 ++--- inc/FNetWifiIWifiDirectGroupOwnerListener.h | 10 ++++----- inc/FNetWifiIWifiSystemMonitoringEventListener.h | 6 ++--- inc/FNetWifiWifiBssInfo.h | 14 ++++++------ inc/FNetWifiWifiDirectDevice.h | 16 +++++++------- inc/FNetWifiWifiDirectDeviceManager.h | 4 ++-- inc/FNetWifiWifiDirectGroupClient.h | 10 ++++----- inc/FNetWifiWifiDirectGroupInfo.h | 8 +++---- inc/FNetWifiWifiDirectGroupMember.h | 2 +- inc/FNetWifiWifiDirectGroupOwner.h | 28 ++++++++++++------------ inc/FNetWifiWifiManager.h | 12 +++++----- inc/FNetWifiWifiTypes.h | 14 ++++++------ src/wifi/FNetWifi_WifiManagerImpl.cpp | 8 +++++-- 14 files changed, 73 insertions(+), 69 deletions(-) diff --git a/inc/FNetWifiIWifiDirectDeviceListener.h b/inc/FNetWifiIWifiDirectDeviceListener.h index dfe9e76..ca6876b 100644 --- a/inc/FNetWifiIWifiDirectDeviceListener.h +++ b/inc/FNetWifiIWifiDirectDeviceListener.h @@ -228,8 +228,8 @@ public: * * @since 2.1 * - * @param[in] localDeviceId An ID for a Wi-Fi Direct device - * @param[in] remoteDeviceInfo The remote device that is found + * @param[in] localDeviceId An ID for a Wi-Fi Direct device + * @param[in] remoteDeviceInfo The remote device that is found * @see WifiDirectDevice::Scan() */ virtual void OnWifiDirectRemoteDeviceFound(WifiDirectDeviceId localDeviceId, const WifiDirectDeviceInfo& remoteDeviceInfo) {} diff --git a/inc/FNetWifiIWifiDirectGroupClientListener.h b/inc/FNetWifiIWifiDirectGroupClientListener.h index 0e32abe..6f3ce8f 100644 --- a/inc/FNetWifiIWifiDirectGroupClientListener.h +++ b/inc/FNetWifiIWifiDirectGroupClientListener.h @@ -39,11 +39,11 @@ class WifiDirectDeviceInfo; * @if OSPDEPREC * @interface IWifiDirectGroupClientListener * @brief [Deprecated] This interface implements listeners for the WifiDirectGroupClient events. - * @deprecated The %WifiDirectGroupClient class is deprecated, therefore, this interface is also deprecated. @n + * @deprecated The WifiDirectGroupClient class is deprecated, therefore, this interface is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role(for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n * The Wi-Fi Direct APIs have now been revised to allow the use of APIs with ease irrespective of the role. Now the APIs have been integrated into the IWifiDirectDeviceListener interface. @n * - * Instead of IWifiDirectGroupClientListener API, use the %IWifiDirectDeviceListener interface. + * Instead of using the %IWifiDirectGroupClientListener interface, use the %IWifiDirectDeviceListener interface. * * @since 2.0 * @@ -65,7 +65,7 @@ public: * @brief [Deprecated] * @deprecated The WifiDirectGroupClient class is deprecated, therefore, this destructor is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role(for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n - * However, now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n + * However, now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. * * * @since 2.0 diff --git a/inc/FNetWifiIWifiDirectGroupOwnerListener.h b/inc/FNetWifiIWifiDirectGroupOwnerListener.h index 11fc510..db00add 100644 --- a/inc/FNetWifiIWifiDirectGroupOwnerListener.h +++ b/inc/FNetWifiIWifiDirectGroupOwnerListener.h @@ -59,8 +59,8 @@ public: /** * @if OSPDEPREC * @brief [Deprecated] - * @deprecated The WifiDirectGroupOwner class is deprecated, therefore, this destructor is also is deprecated. @n - * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role for example, group owner, group client, and so on) and so it was necessary to use these APIs. Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role . @n + * @deprecated The WifiDirectGroupOwner class is deprecated, therefore, this destructor is also deprecated. @n + * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role for example, group owner, group client, and so on) and so it was necessary to use these APIs. Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. * * * @since 2.0 @@ -138,7 +138,7 @@ public: * @brief [Deprecated] * @deprecated The WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n - * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n + * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. * * @since 2.0 @@ -161,9 +161,9 @@ public: * Called to notify the application that the group member information service has stopped. * * @brief [Deprecated] - * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method also is deprecated. @n + * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n - * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n + * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. * * @since 2.0 diff --git a/inc/FNetWifiIWifiSystemMonitoringEventListener.h b/inc/FNetWifiIWifiSystemMonitoringEventListener.h index 1654e98..60b2ab8 100644 --- a/inc/FNetWifiIWifiSystemMonitoringEventListener.h +++ b/inc/FNetWifiIWifiSystemMonitoringEventListener.h @@ -35,7 +35,7 @@ namespace Tizen { namespace Net { namespace Wifi * * @since 2.0 * - * The IWifiSystemMonitoringEventListener interface specifies the methods used for creating notifications about the different + * The %IWifiSystemMonitoringEventListener interface specifies the methods used for creating notifications about the different * kinds of Wi-Fi system monitoring events. When a Wi-Fi system monitoring event is generated, one of these methods is called. */ class _OSP_EXPORT_ IWifiSystemMonitoringEventListener @@ -56,7 +56,7 @@ public: * @since 2.0 * * @param[in] state The state of the Wi-Fi current connection - * @remark When the local device is connected with a particular access point, + * @remarks When the local device is connected with a particular access point, * IWifiManagerEventListener::OnWifiConnected() as well as this method with @c WIFI_CONN_STATE_CONNECTED * are called. Therefore, be careful to manipulate only one of those methods. So are the cases of * IWifiManagerEventListener::OnWifiDisconnected() and this method with @c WIFI_CONN_STATE_NOT_CONNECTED. @@ -68,7 +68,7 @@ public: * * @since 2.0 * - * @remark Call WifiManager::GetSystemScanResultN() for checking the content of this update. + * @remarks Call WifiManager::GetSystemScanResultN() for checking the content of this update. */ virtual void OnWifiSystemScanResultUpdated(void) = 0; diff --git a/inc/FNetWifiWifiBssInfo.h b/inc/FNetWifiWifiBssInfo.h index f73cd77..543fff3 100644 --- a/inc/FNetWifiWifiBssInfo.h +++ b/inc/FNetWifiWifiBssInfo.h @@ -89,8 +89,8 @@ public: * * @since 2.0 * - * @return The BSSID expressed as a 6 byte hexadecimal value delimited by dashes, @n - * For example, "00-3D-47-EF-8A-03" + * @return The BSSID expressed as a 6 byte hexadecimal value delimited by dashes @n + * For example, "00-3D-47-EF-8A-03". */ Tizen::Base::String GetBssId(void) const; @@ -210,10 +210,10 @@ public: * @since 2.0 * * @return An error code - * @param[in] pAddress The new address to be assigned + * @param[in] pAddress The new address to assign * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of this operation. - * For example, The address scheme for the IP address is NET_ADDRESS_SCHEME_DYNAMIC. + * For example, the address scheme for the IP address is @c NET_ADDRESS_SCHEME_DYNAMIC. * @remarks The existing local address is unset when the input argument is @c null. * @see GetLocalAddress() */ @@ -258,7 +258,7 @@ public: * else @c null if an error occurs or there is no previously set address * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of this operation. @n - * For example, the address scheme for the IP address is NET_ADDRESS_SCHEME_DYNAMIC. + * For example, the address scheme for the IP address is @c NET_ADDRESS_SCHEME_DYNAMIC. * @remarks The specific error code can be accessed using the GetLastResult() method. * @see SetDefaultGatewayAddress() */ @@ -318,7 +318,7 @@ public: * else @c null if an error occurs or there is no previously set address * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of this operation. @n - * For example, the address scheme for the IP address is NET_ADDRESS_SCHEME_DYNAMIC. + * For example, the address scheme for the IP address is @c NET_ADDRESS_SCHEME_DYNAMIC. * @remarks The specific error code can be accessed using the GetLastResult() method. * @see SetSecondaryDnsAddress() */ @@ -383,7 +383,7 @@ public: * @param[in] address The proxy address * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of this operation. - * For example, The specified input type is NET_PROXY_TYPE_NONE. + * For example, the specified input type is @c NET_PROXY_TYPE_NONE. * @remarks The existing proxy address is unset when the input argument is an empty string. * @see GetProxyAddress() */ diff --git a/inc/FNetWifiWifiDirectDevice.h b/inc/FNetWifiWifiDirectDevice.h index 6d30f1d..6b294cf 100755 --- a/inc/FNetWifiWifiDirectDevice.h +++ b/inc/FNetWifiWifiDirectDevice.h @@ -86,7 +86,7 @@ public: * Adds a listener for the Wi-Fi Direct group owner. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupOwner class is deprecated, therefore, this method also is deprecated. @n + * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method also is deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n @@ -108,7 +108,7 @@ public: * Adds a listener for the Wi-Fi Direct group client. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupClient class is deprecated, therefore, this method also is deprecated. @n + * @deprecated The %WifiDirectGroupClient class is deprecated, therefore, this method also is deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n * @@ -142,7 +142,7 @@ public: * Removes a listener for the Wi-Fi Direct group owner. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupOwner class is deprecated, therefore, this method also is deprecated. @n + * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method also is deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n * @since 2.0 @@ -161,7 +161,7 @@ public: * Removes a listener for the Wi-Fi Direct group client. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupClient class is deprecated, therefore, this method also is deprecated. @n + * @deprecated The %WifiDirectGroupClient class is deprecated, therefore, this method also is deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n * @@ -314,7 +314,7 @@ public: * @brief [Deprecated] * @deprecated This method is deprecated because the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role (for example, group owner, group client, and so on). @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role and so it was necessary to use these APIs. - * Instead of using this API, use Connect() or CreateAutonomousGroup() API. + * Instead of using this method, use the Connect() or CreateAutonomousGroup() method. * * @since 2.0 * @privlevel public @@ -337,7 +337,7 @@ public: * If @c pWifiDirectGroupInfo is not specified, the Wi-Fi Direct group is created as per the default system configuration settings. @n * If @c pWifiDirectRemoteDeviceInfo is not specified, the Wi-Fi Direct group is created with the * first found device having the same local device name. - * Use SetLocalDeviceName() method to set the device name before activation. @n + * Use the SetLocalDeviceName() method to set the device name before activation. @n * To obtain a list of Wi-Fi Direct devices which can be candidates for the @c pWifiDirectRemoteDeviceInfo * parameter, use the Scan() method prior using this method. * To connect a specified Wi-Fi Direct group owner directly, the Scan() and Associate() methods can be used. @n @@ -357,7 +357,7 @@ public: * @brief [Deprecated] * @deprecated This method is deprecated because the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role (for example, group owner, group client, and so on). @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role and so it was necessary to use these APIs. @n - * Instead of using this API, use CancelConnect() API + * Instead of using this method, use the CancelConnect() method. * * @since 2.0 * @privlevel public @@ -420,7 +420,7 @@ public: * @brief [Deprecated] * @deprecated This method is deprecated because the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role (for example, group owner, group client, and so on). @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role and so it was necessary to use these APIs. @n - * Instead of using this API, use Connect() API + * Instead of using this method, use the Connect() method. * * @since 2.0 * @privlevel public diff --git a/inc/FNetWifiWifiDirectDeviceManager.h b/inc/FNetWifiWifiDirectDeviceManager.h index 02d9864..b2c240b 100644 --- a/inc/FNetWifiWifiDirectDeviceManager.h +++ b/inc/FNetWifiWifiDirectDeviceManager.h @@ -70,7 +70,7 @@ public: * * @since 2.0 * - * @return An IList containing WifiDirectDeviceInfo of local devices in the system if successful, @n + * @return A Tizen::Base::Collection::IList containing WifiDirectDeviceInfo of local devices in the system if successful, @n * else @c null * @exception E_SUCCESS The method is successful. * @exception E_SYSTEM An internal error has occurred. @@ -88,7 +88,7 @@ public: * * @return An instance of WifiDirectDevice if successful, @n * else @c null - * @param[in] pLocalDeviceInfo A pointer of WifiDirectDeviceInfo + * @param[in] pLocalDeviceInfo A pointer to WifiDirectDeviceInfo * @exception E_SUCCESS The method is successful. * @exception E_SYSTEM An internal error has occurred. * @exception E_INVALID_ARG The specified input parameter is invalid. diff --git a/inc/FNetWifiWifiDirectGroupClient.h b/inc/FNetWifiWifiDirectGroupClient.h index 043f364..7ae86a1 100755 --- a/inc/FNetWifiWifiDirectGroupClient.h +++ b/inc/FNetWifiWifiDirectGroupClient.h @@ -54,7 +54,7 @@ public: * This is the destructor for this class. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupClient class is deprecated, therefore, this method is also deprecated. @n + * @deprecated The %WifiDirectGroupClient class is deprecated, therefore, this method is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n * @@ -68,9 +68,9 @@ public: * Closes the connection. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupClient class is deprecated. Therefore, this method is also deprecated, because previously the Wi-Fi Direct APIs were provided centered on the role(e.g. group owner, group client) @n + * @deprecated The %WifiDirectGroupClient class is deprecated. Therefore, this method is also deprecated, because previously the Wi-Fi Direct APIs were provided centered on the role(e.g. group owner, group client) @n * so it was necessary to use APIs in accordance with the strict role; however, it has been revised to allow using APIs with ease without discerning the role. @n - * it is integrated into WifiDirectDevice class. use WifiDirectDevice::Disconnect() API. + * It is integrated into WifiDirectDevice class. Use the WifiDirectDevice::Disconnect() method. * * @since 2.0 * @privlevel public @@ -93,9 +93,9 @@ public: * Requests the WifiDirectDeviceInfo of the Wi-Fi Direct group owner. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupClient class is deprecated. Therefore, this method is also deprecated, because previously the Wi-Fi Direct APIs were provided centered on the role(e.g. group owner, group client) @n + * @deprecated The %WifiDirectGroupClient class is deprecated. Therefore, this method is also deprecated, because previously the Wi-Fi Direct APIs were provided centered on the role(e.g. group owner, group client) @n * so it was necessary to use APIs in accordance with the strict role; however, it has been revised to allow using APIs with ease without discerning the role. @n - * Instead of using this API, WifiDirectDevice::GetGroupOwnerInfoN() API. + * Instead of using this method, use the WifiDirectDevice::GetGroupOwnerInfoN() method. * * @since 2.0 * @privlevel public diff --git a/inc/FNetWifiWifiDirectGroupInfo.h b/inc/FNetWifiWifiDirectGroupInfo.h index 24ae767..bdd768a 100644 --- a/inc/FNetWifiWifiDirectGroupInfo.h +++ b/inc/FNetWifiWifiDirectGroupInfo.h @@ -85,7 +85,7 @@ public: bool GetAutonomousGroupOwnerMode(void) const; /** - * Gets the intent of a group owner. It is used during the negotiation phase. + * Gets the intent of a group owner. @n It is used during the negotiation phase. * * @since 2.0 * @@ -111,7 +111,7 @@ public: * @brief [Deprecated] [Compatibility] * @endif * @deprecated This method is deprecated because this class has been modified and is now composed of information that is exclusively required to configure a group. @n - * So, new APIs have been added. Instead of using GetSsid() API, use WifiDirectDevice::GetGroupOwnerInfoN() or WifiDirectDevice::GetLocalDeviceInfo() API. + * So, new APIs have been added. Instead of using the %GetSsid() method, use the WifiDirectDevice::GetGroupOwnerInfoN() or WifiDirectDevice::GetLocalDeviceInfo() method. * * @since 2.0 * @if OSPCOMPAT @@ -144,7 +144,7 @@ public: * * @brief [Deprecated] * @deprecated This method is deprecated because this class has been modified and is now composed of information that is exclusively required to configure a group. @n - * So, a new API has been added. Instead of using GetBssId() API, use WifiDirectDevice::GetGroupOwnerInfoN() API. + * So, a new API has been added. Instead of using the %GetBssId() method, use the WifiDirectDevice::GetGroupOwnerInfoN() method. * * @since 2.0 * @@ -174,7 +174,7 @@ public: * * @brief [Deprecated] * @deprecated This method is deprecated because this class has been modified and is now composed of information exclusively required to configure a group. @n - * So, a new API has been added. Instead of using SetAutonomousGroupOwnerMode() method, use WifiDirectDevice::CreateAutonomousGroup() API. + * So, a new API has been added. Instead of using the %SetAutonomousGroupOwnerMode() method, use the WifiDirectDevice::CreateAutonomousGroup() method. * * @since 2.0 * diff --git a/inc/FNetWifiWifiDirectGroupMember.h b/inc/FNetWifiWifiDirectGroupMember.h index a965fe9..a0d273b 100644 --- a/inc/FNetWifiWifiDirectGroupMember.h +++ b/inc/FNetWifiWifiDirectGroupMember.h @@ -34,7 +34,7 @@ class WifiDirectGroupMemberImpl; * @class WifiDirectGroupMember * @brief [Deprecated] This class provides methods for the Wi-Fi Direct group member. * @deprecated This method is deprecated because the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role (for example, group owner, group client, and so on). @n - * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role and so it was necessary to use these APIs. + * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role and so it was necessary to use these APIs. * * @since 2.0 * diff --git a/inc/FNetWifiWifiDirectGroupOwner.h b/inc/FNetWifiWifiDirectGroupOwner.h index 287bbfa..7145e38 100755 --- a/inc/FNetWifiWifiDirectGroupOwner.h +++ b/inc/FNetWifiWifiDirectGroupOwner.h @@ -39,7 +39,7 @@ class WifiDirectDeviceInfo; * @if OSPDEPREC * @class WifiDirectGroupOwner * @brief [Deprecated] This class provides methods for the Wi-Fi Direct group owner management. - * @deprecated This method is deprecated because the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role (for example, group owner, group client, and so on). @n + * @deprecated This class is deprecated because the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role (for example, group owner, group client, and so on). @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role and so it was necessary to use these APIs. @n * As the APIs have been integrated into the WifiDirectDevice class, use IWifiDirectDevice class instead. * @@ -58,9 +58,9 @@ public: * This destructor overrides Tizen::Base::Object::~Object(). * * @brief [Deprecated] - * @deprecated %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n + * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n - * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n + * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. * * @since 2.0 * @endif @@ -72,10 +72,10 @@ public: * Destroys a Wi-Fi Direct group. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n + * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n - * As the APIs have been integrated into the WifiDirectDevice class, use WifiDirectDevice::LeaveGroup() API instead. + * As the APIs have been integrated into the WifiDirectDevice class, use the WifiDirectDevice::LeaveGroup() method instead. * * @since 2.0 * @privlevel public @@ -98,10 +98,10 @@ public: * Disconnects a specified Wi-Fi Direct group client. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n + * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n - * As the APIs have been integrated into the WifiDirectDevice class, use WifiDirectDevice::Disconnect() API instead. + * As the APIs have been integrated into the WifiDirectDevice class, use the WifiDirectDevice::Disconnect() method instead. * * @since 2.0 * @privlevel public @@ -126,10 +126,10 @@ public: * Gets the list of information of all the members of the Wi-Fi Direct group. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupOwner class is deprecated ,therefore, this method is also deprecated. @n -* Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n + * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n + * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n - * Instead of GetAllGroupMemberInfoListN() method, use WifiDirectDevice::GetGroupOwnerInfoN() for group owner information and WifiDirectDevice::GetGroupClientInfoListN() for group clients information. + * Instead of the GetAllGroupMemberInfoListN() method, use WifiDirectDevice::GetGroupOwnerInfoN() for group owner information and WifiDirectDevice::GetGroupClientInfoListN() for group clients information. * * @since 2.0 * @@ -149,9 +149,9 @@ public: * Starts the group member information service. * * @brief [Deprecated] - * @deprecated This method is deprecated, therefore, this method is also deprecated. @n + * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n - * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n + * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. * * @since 2.0 * @privlevel public @@ -177,9 +177,9 @@ public: * Stops the group member information service. * * @brief [Deprecated] - * @deprecated %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n + * @deprecated The %WifiDirectGroupOwner class is deprecated, therefore, this method is also deprecated. @n * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role (for example, group owner, group client, and so on) and so it was necessary to use these APIs. @n - * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. @n + * Now the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role. * * @since 2.0 * @privlevel public diff --git a/inc/FNetWifiWifiManager.h b/inc/FNetWifiWifiManager.h index 5541f2e..8fc9484 100755 --- a/inc/FNetWifiWifiManager.h +++ b/inc/FNetWifiWifiManager.h @@ -264,8 +264,8 @@ public: result SetWifiSystemScanMode(WifiSystemScanMode mode); /** - * Adds the specified listener for receiving the notification when the state of current Wi-Fi connection is changed - * or the result of Wi-Fi background scanning is updated + * Adds the specified @c listener for receiving the notification when the state of current Wi-Fi connection is changed + * or the result of Wi-Fi background scanning is updated. * * @since 2.0 * @privlevel platform @@ -281,7 +281,7 @@ public: result AddSystemMonitoringEventListener(IWifiSystemMonitoringEventListener& listener); /** - * Removes the specified IWifiSystemMonitoringEventListener instance for receiving the notification. The removed listener + * Removes the specified IWifiSystemMonitoringEventListener instance for receiving the notification. @n The removed listener * cannot listen to the events that are fired. * * @since 2.0 @@ -311,8 +311,8 @@ public: * * @since 2.0 * - * @return A pointer to the WifiBssInfo instance representing the information of current Wi-Fi connection target - * else @c null if GetConnectionState() is WIFI_CONN_STATE_NOT_CONNECTED + * @return A pointer to the WifiBssInfo instance representing the information of current Wi-Fi connection target, @n + * else @c null if GetConnectionState() is ::WIFI_CONN_STATE_NOT_CONNECTED */ WifiBssInfo* GetConnectionTargetInfoN(void) const; @@ -340,7 +340,7 @@ public: * * @since 2.0 * - * @return An IList containing WifiBssInfo of existing Wi-Fi connections if successful, @n + * @return A Tizen::Base::Collection::IList containing WifiBssInfo of existing Wi-Fi connections if successful, @n * else @c null */ Tizen::Base::Collection::IList* GetSystemScanResultN(void) const; diff --git a/inc/FNetWifiWifiTypes.h b/inc/FNetWifiWifiTypes.h index f99a643..bd4f3c1 100644 --- a/inc/FNetWifiWifiTypes.h +++ b/inc/FNetWifiWifiTypes.h @@ -17,7 +17,7 @@ /** * @file FNetWifiWifiTypes.h - * @brief This is the header file for the enumerations in the Wifi namespace. + * @brief This is the header file for the enumerations of the Wifi namespace. * * This header file contains the type declarations of the Wifi namespace. */ @@ -98,7 +98,7 @@ enum WifiBssType /** * @enum WifiAuthenticationType * - * Defines IEEE 802.11 authentication. + * Defines IEEE 802.11 authentication. @n * IEEE 802.11 authentication operates at the link level between IEEE 802.11 stations (STAs). * IEEE 802.11 does not provide end-to-end (message origin to message destination) or user-to-user authentication. * @@ -163,7 +163,7 @@ enum WifiEapType * Defines the Wired Equivalent Privacy (WEP) key length. * * @brief [Deprecated] - * @deprecated This enum is deprecated because the SetNetworkKeyWep() method is also deprecated. + * @deprecated This enum is deprecated because the WifiSecurityInfo::SetNetworkKeyWep() method is also deprecated. * * @since 2.0 * @endif @@ -185,7 +185,7 @@ enum WifiWepKeyLen * Defines the Wired Equivalent Privacy (WEP) key index. * * @brief [Deprecated] - * @deprecated This enum is deprecated because the SetNetworkKeyWep() method is also deprecated. + * @deprecated This enum is deprecated because the WifiSecurityInfo::SetNetworkKeyWep() method is also deprecated. * * @since 2.0 * @@ -296,7 +296,7 @@ enum WifiDirectDeviceTypeCategory * * @brief [Deprecated] * @deprecated This method is deprecated because the Wi-Fi Direct APIs have been revised to allow the use of APIs with ease irrespective of the role (for example, group owner, group client, and so on). @n - * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role and so it was necessary to use these APIs. + * Earlier, the Wi-Fi Direct APIs were strictly provided depending on the role and so it was necessary to use these APIs. * * @since 2.0 * @endif @@ -351,12 +351,12 @@ enum WifiConnectionState enum WifiSystemScanMode { WIFI_SYSTEM_SCAN_MODE_ACTIVE = 0, /**< The background scanning is performed with the short and fixed time interval - * (10 seconds) during the Wi-Fi connection is not established. The Wi-Fi target picker + * (10 seconds) during which the Wi-Fi connection is not established @n The Wi-Fi target picker * popup for connection is not launched when Wi-Fi is turned on. @n * Generally, this mode is for the case that the Wi-Fi setting app is running on * foreground. */ WIFI_SYSTEM_SCAN_MODE_PASSIVE /**< The background scanning is performed with the exponential backoff time interval - * (4, 8, ..., and finally 128 seconds) during the Wi-Fi connection is not established. + * (4, 8, ..., and finally 128 seconds) during which the Wi-Fi connection is not established @n * The Wi-Fi target picker popup for connection is launched when Wi-Fi is turned on. @n * Generally, this mode is for the both cases that the Wi-Fi setting app is running on * background and terminated. */ diff --git a/src/wifi/FNetWifi_WifiManagerImpl.cpp b/src/wifi/FNetWifi_WifiManagerImpl.cpp index 4253ff0..cd25670 100644 --- a/src/wifi/FNetWifi_WifiManagerImpl.cpp +++ b/src/wifi/FNetWifi_WifiManagerImpl.cpp @@ -55,14 +55,18 @@ _WifiManagerImpl::_WifiManagerImpl(void) _WifiManagerImpl::~_WifiManagerImpl(void) { - __pWifiSystemAdapter->UnregisterManagerEventListener(*this); + if (__pWifiSystemAdapter != null) + { + __pWifiSystemAdapter->UnregisterManagerEventListener(*this); + } + delete __pMonitoringEvt; } result _WifiManagerImpl::Construct(IWifiManagerEventListener& listener) { - result r = E_SUCCESS; + result r = E_SUCCESS; unique_ptr<_WifiSystemMonitoringEvent> pMonitoringEvt; SysAssertf(__pWifiSystemAdapter == null, -- 2.7.4