merge with master

[platform/framework/native/messaging.git] / inc / FMsgWapPushManager.h

diff --git a/inc/FMsgWapPushManager.h b/inc/FMsgWapPushManager.h
index bb499d0..f74dd59 100755 (executable)
--- a/inc/FMsgWapPushManager.h
+++ b/inc/FMsgWapPushManager.h
@@ -15,22 +15,20 @@
 // limitations under the License.
 //
 /**
-* @if VISPARTNER-OPERATOR
-*
 * @file                        FMsgWapPushManager.h
 * @brief               This is the header file for the %WapPushManager class.
 *
-* @visibility  partner-operator
-*
 * This header file contains the declarations of the %WapPushManager class.
-*
-* @endif
 */
 
 #ifndef _FMSG_WAP_PUSH_MANAGER_H_
 #define _FMSG_WAP_PUSH_MANAGER_H_
 
-#include <FBase.h>
+namespace Tizen { namespace Base
+{
+class String;
+} }
+
 #include <FMsgIWapPushEventListener.h>
 
 namespace Tizen { namespace Messaging
@@ -38,59 +36,39 @@ namespace Tizen { namespace Messaging
 class _WapPushManagerImpl;
 
 /**
-* @if VISPARTNER-OPERATOR
-*
 * @class       WapPushManager
 * @brief       This class provides methods to use the WAP Push messaging service.
 *
 * @since               2.0
 *
 * @final       This class is not intended for extension.
-*
-* @visibility  partner-operator
-*
-* @endif
 */
 class _OSP_EXPORT_ WapPushManager
        : public Tizen::Base::Object
 {
 public:
        /**
-       * @if VISPARTNER-OPERATOR
-       *
        * This is the default constructor for this class.
        *
        * @since                2.0
-       *
-       * @visibility   partner-operator
-       *
-       * @endif
        */
        WapPushManager(void);
 
        /**
-       * @if VISPARTNER-OPERATOR
-       *
        * This destructor overrides Tizen::Base::Object::~Object().
        *
        * @since                2.0
-       *
-       * @visibility   partner-operator
-       *
-       * @endif
        */
        virtual ~WapPushManager(void);
 
 public:
        /**
-       * @if VISPARTNER-OPERATOR
-       *
        * Adds the event listener for receiving WAP Push messages for a specific WAP Push application ID.
        *
        * @since                2.0
        *
-       * @visibility   partner-operator
-       * @privilege    %http://tizen.org/privilege/wappush
+       * @privlevel    platform
+       * @privilege    http://tizen.org/privilege/wappush
        *
        * @return               An error code
        * @param[in]    wapApplicationId                The X-Wap-Application-Id indicating a WAP Push application ID
@@ -103,21 +81,17 @@ public:
        * @exception    E_PRIVILEGE_DENIED              The application does not have the privilege to call this method.
        * @see                  IWapPushEventListener
     * @see             RemoveWapPushEventListener()
-       *
-       * @endif
        */
        result AddWapPushEventListener(const Tizen::Base::String& wapApplicationId, IWapPushEventListener& listener);
 
        /**
-       * @if VISPARTNER-OPERATOR
-       *
        * Removes the event listener for receiving WAP Push messages for a specific WAP Push application
        * ID.
        *
        * @since                2.0
        *
-       * @visibility   partner-operator
-       * @privilege    %http://tizen.org/privilege/wappush
+       * @privlevel    platform
+       * @privilege    http://tizen.org/privilege/wappush
        *
        * @return               An error code
        * @param[in]    wapApplicationId                The X-Wap-Application-Id indicating a WAP Push
@@ -131,20 +105,16 @@ public:
        * @exception    E_PRIVILEGE_DENIED              The application does not have the privilege to call this method.
        * @see                  IWapPushEventListener
     * @see             AddWapPushEventListener()
-       *
-       * @endif
        */
        result RemoveWapPushEventListener(const Tizen::Base::String& wapApplicationId, IWapPushEventListener& listener);
 
        /**
-       * @if VISPARTNER-OPERATOR
-       *
        * Registers a condition to receive WAP Push message.
        *
        * @since                2.0
        *
-       * @visibility   partner-operator
-       * @privilege    %http://tizen.org/privilege/wappush
+       * @privlevel    platform
+       * @privilege    http://tizen.org/privilege/wappush
        *
        * @return               An error code
        * @param[in]    wapApplicationId        The X-Wap-Application-Id indicating a WAP push application ID.
@@ -155,20 +125,16 @@ public:
        * @exception    E_SYSTEM                        A system error has occurred.
        * @exception    E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
        * @see                  UnregisterCondition()
-       *
-       * @endif
        */
        result RegisterCondition(const Tizen::Base::String& wapApplicationId, const Tizen::Base::String& contentType);
 
        /**
-       * @if VISPARTNER-OPERATOR
-       *
        * Unregisters a condition to receive WAP push message.
        *
        * @since                2.0
        *
-       * @visibility   partner-operator
-       * @privilege    %http://tizen.org/privilege/wappush
+       * @privlevel    platform
+       * @privilege    http://tizen.org/privilege/wappush
        *
        * @return               An error code
        * @param[in]    wapApplicationId        The X-Wap-Application-Id indicating a WAP push application ID.
@@ -179,8 +145,6 @@ public:
        * @exception    E_SYSTEM                        A system error has occurred.
        * @exception    E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
        * @see                  RegisterCondition()
-       *
-       * @endif
        */
        result UnregisterCondition(const Tizen::Base::String& wapApplicationId, const Tizen::Base::String& contentType);