merge with master

[framework/osp/net.git] / inc / FNetWifiWifiBssInfo.h

diff --git a/inc/FNetWifiWifiBssInfo.h b/inc/FNetWifiWifiBssInfo.h
index ba999d8..f73cd77 100644 (file)
--- a/inc/FNetWifiWifiBssInfo.h
+++ b/inc/FNetWifiWifiBssInfo.h
@@ -150,63 +150,49 @@ public:
     void SetSsid(const Tizen::Base::String& ssid);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Checks whether an access point (BSS) is known or not. @n
         * The access point becomes a known BSS if it has been connected with this device.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      @c true if the access point is known, @n
      *              else @c false
      * @see         SetUnknown()
-     * @endif
      */
     bool IsKnown(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the access point (BSS) unknown.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @see         IsKnown()
-     * @endif
      */
     void SetUnknown(void);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the local IP address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      The address scheme for the local IP address
-     * @endif
      */
     Tizen::Net::NetAddressScheme GetLocalAddressScheme(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the local IP address scheme. @n
         * The %SetLocalAddressScheme() method allows determining whether to use static address or dynamic address.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @param[in]   scheme              The address scheme for the local IP address
-     * @endif
      */
     void SetLocalAddressScheme(Tizen::Net::NetAddressScheme scheme);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the local IP address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      The local address configured to this access point, @n
      *              else @c null if an error occurs or there is no previously set address
@@ -215,16 +201,13 @@ public:
      *                                  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         SetLocalAddress()
-     * @endif
      */
     const Tizen::Net::IpAddress* GetLocalAddress(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the local IP address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      An error code
      * @param[in]   pAddress            The new address to be assigned
@@ -233,16 +216,13 @@ public:
      *                                  For example, The address scheme for the IP address is NET_ADDRESS_SCHEME_DYNAMIC.
      * @remarks     The existing local address is unset when the input argument is @c null.
      * @see         GetLocalAddress()
-     * @endif
      */
     result SetLocalAddress(const Tizen::Net::IpAddress* pAddress);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the subnet mask address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      The subnet mask address configured to this access point, @n
      *              else @c null if an error occurs or there is no previously set address
@@ -251,16 +231,13 @@ public:
      *                                  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         SetSubnetMaskAddress()
-     * @endif
      */
     const Tizen::Net::IpAddress* GetSubnetMaskAddress(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the subnet mask address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      An error code
      * @param[in]   pAddress            The new address to assign
@@ -269,16 +246,13 @@ public:
      *                                  For example, the address scheme for the IP address is @c NET_ADDRESS_SCHEME_DYNAMIC.
      * @remarks     The existing subnet mask address is unset when the input argument is @c null.
      * @see         GetSubnetMaskAddress()
-     * @endif
      */
     result SetSubnetMaskAddress(const Tizen::Net::IpAddress* pAddress);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the default gateway address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      The default gateway address configured to this access point, @n
      *              else @c null if an error occurs or there is no previously set address
@@ -287,16 +261,13 @@ public:
      *                                  For example, the address scheme for the IP address is NET_ADDRESS_SCHEME_DYNAMIC.
      * @remarks     The specific error code can be accessed using the GetLastResult() method.
      * @see         SetDefaultGatewayAddress()
-     * @endif
      */
     const Tizen::Net::IpAddress* GetDefaultGatewayAddress(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the default gateway address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      An error code
      * @param[in]   pAddress            The new address to assign
@@ -305,16 +276,13 @@ public:
      *                                  For example, the address scheme for the IP address is @c NET_ADDRESS_SCHEME_DYNAMIC.
      * @remarks     The existing gateway address is unset when the input argument is @c null.
      * @see         GetDefaultGatewayAddress()
-     * @endif
      */
     result SetDefaultGatewayAddress(const Tizen::Net::IpAddress* pAddress);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the primary DNS address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      The primary DNS address configured to this access point, @n
      *              else @c null if an error occurs or there is no previously set address
@@ -323,16 +291,13 @@ public:
      *                                  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         SetPrimaryDnsAddress()
-     * @endif
      */
     const Tizen::Net::IpAddress* GetPrimaryDnsAddress(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the primary DNS address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      An error code
      * @param[in]   pAddress            The new address to assign
@@ -341,16 +306,13 @@ public:
      *                                  For example, the address scheme for the IP address is @c NET_ADDRESS_SCHEME_DYNAMIC.
      * @remarks     The existing primary DNS address is unset when the input argument is @c null.
      * @see         GetPrimaryDnsAddress()
-     * @endif
      */
     result SetPrimaryDnsAddress(const Tizen::Net::IpAddress* pAddress);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the secondary DNS address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      The secondary DNS address configured to this access point, @n
      *              else @c null if an error occurs or there is no previously set address
@@ -359,16 +321,13 @@ public:
      *                                  For example, the address scheme for the IP address is NET_ADDRESS_SCHEME_DYNAMIC.
      * @remarks     The specific error code can be accessed using the GetLastResult() method.
      * @see         SetSecondaryDnsAddress()
-     * @endif
      */
     const Tizen::Net::IpAddress* GetSecondaryDnsAddress(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the secondary DNS address in the static address scheme.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      An error code
      * @param[in]   pAddress            The new address to assign
@@ -377,42 +336,33 @@ public:
      *                                  For example, the address scheme for the IP address is @c NET_ADDRESS_SCHEME_DYNAMIC.
      * @remarks     The existing secondary DNS address is unset when the input argument is @c null.
      * @see         GetSecondaryDnsAddress()
-     * @endif
      */
     result SetSecondaryDnsAddress(const Tizen::Net::IpAddress* pAddress);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the proxy type.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      The proxy type
      * @see         SetProxyType()
-     * @endif
      */
     Tizen::Net::NetProxyType GetProxyType(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the proxy type.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @param[in]   type                The proxy type
      * @see         GetProxyType()
-     * @endif
      */
     void SetProxyType(Tizen::Net::NetProxyType type);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the proxy address.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      The proxy address, @n
      *              else an empty string if an error occurs or there is no previously set address
@@ -421,16 +371,13 @@ public:
      *                                  For example, the specified input type is @c NET_PROXY_TYPE_NONE.
      * @remarks     The specific error code can be accessed using the GetLastResult() method.
      * @see         SetProxyAddress()
-     * @endif
      */
     Tizen::Base::String GetProxyAddress(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the proxy address.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      An error code
      * @param[in]   address             The proxy address
@@ -439,7 +386,6 @@ public:
      *                                  For example, The specified input type is NET_PROXY_TYPE_NONE.
      * @remarks     The existing proxy address is unset when the input argument is an empty string.
      * @see         GetProxyAddress()
-     * @endif
      */
     result SetProxyAddress(const Tizen::Base::String& address);