Merge from tizen_2.2.1

[platform/framework/native/appfw.git] / src / app / inc / FApp_AppControlImpl.h

diff --git a/src/app/inc/FApp_AppControlImpl.h b/src/app/inc/FApp_AppControlImpl.h
index 98ea6f7..4996ccf 100644 (file)
--- a/src/app/inc/FApp_AppControlImpl.h
+++ b/src/app/inc/FApp_AppControlImpl.h
@@ -71,12 +71,18 @@ public:
        /**
         * Internal GetImpl() method.
         */
-       static const _AppControlImpl* GetInstance(const AppControl& ac);
+       static const _AppControlImpl* GetInstance(const AppControl& ac)
+       {
+               return ac.__pAppControlImpl;
+       }
 
        /**
         * Internal GetImpl() method.
         */
-       static _AppControlImpl* GetInstance(AppControl& ac);
+       static _AppControlImpl* GetInstance(AppControl& ac)
+       {
+               return ac.__pAppControlImpl;
+       }
 
        /**
         * Starts the resolved application control. @n
@@ -136,28 +142,37 @@ public:
         *
         * @return              The name of the application providing this %_AppControlImpl instance
         */
-       Tizen::Base::String GetAppName(void);
+       Tizen::Base::String GetAppName(void) const;
 
        /**
         * Gets the associated application ID. @n
         *
         * @return              The application control ID
         */
-       Tizen::Base::String GetAppId(void) const;
+       Tizen::Base::String GetAppId(void) const
+       {
+               return _appId;
+       }
 
        /**
         * Gets the associated application control provider ID. @n
         *
         * @return              The application control provider ID
         */
-       const Tizen::Base::String& GetAppControlProviderId(void) const;
+       Tizen::Base::String GetAppControlProviderId(void) const
+       {
+               return _appId;
+       }
 
        /**
         * Gets the associated operation ID. @n
         *
         * @return              The operation ID
         */
-       const Tizen::Base::String& GetOperationId(void) const;
+       Tizen::Base::String GetOperationId(void) const
+       {
+               return _opId;
+       }
 
        /**
         * Returns the associated application control categories.
@@ -230,7 +245,7 @@ public:
 
        virtual void OnAppControlResponseEventReceivedN(const Tizen::Base::Runtime::IEventArg* arg);
 private:
-       _AppControlImpl(const AppControl& value);
+       explicit _AppControlImpl(const AppControl& value);
 
        /**
         * This is the default constructor for this class.
@@ -262,7 +277,7 @@ protected:
        Tizen::Base::String _path;
        Tizen::Base::String _appId;
        Tizen::Base::String _opId;
-       Tizen::Base::String _appName;
+       mutable Tizen::Base::String _appName;
        int     _reqId;
        int     _property;
        int _processId;