update deprecated privilege in the header files.

Change-Id: I93b48f963cd649abbb3f0c978b4a7e494f925dce

diff --git a/inc/FShell.h b/inc/FShell.h
index 29c45c2..1abbb4f 100644 (file)
--- a/inc/FShell.h
+++ b/inc/FShell.h
@@ -41,6 +41,7 @@
 #include <FShellAppWidgetFrame.h>
 #include <FShellAppWidgetPopup.h>
 #include <FShellIAppWidgetRequestListener.h>
+#include <FShellIAppWidgetViewEventListener.h>
 #include <FShellShortcutManager.h>
 #include <FShellIShortcutRequestListener.h>
 #include <FShellLockManager.h>

diff --git a/inc/FShellNotificationManager.h b/inc/FShellNotificationManager.h
index 6919ddd..585a837 100644 (file)
--- a/inc/FShellNotificationManager.h
+++ b/inc/FShellNotificationManager.h
@@ -276,7 +276,8 @@ public:
         * @since       2.0
         *
         * @privlevel   public
-        * @privilege   %http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification @n
+        *                              (%http://tizen.org/privilege/notificationmanager is deprecated.)
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -310,7 +311,8 @@ public:
         * @since       2.0
         *
         * @privlevel   public
-        * @privilege   %http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification @n
+        *                              (%http://tizen.org/privilege/notificationmanager is deprecated.)
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -387,7 +389,8 @@ public:
         * @since       2.0
         *
         * @privlevel   public
-        * @privilege   %http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification @n
+        *                              (%http://tizen.org/privilege/notificationmanager is deprecated.)
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -421,7 +424,8 @@ public:
         * @since       2.0
         *
         * @privlevel   public
-        * @privilege   %http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification @n
+        *                              (%http://tizen.org/privilege/notificationmanager is deprecated.)
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -438,7 +442,8 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   %http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification @n
+        *                              (%http://tizen.org/privilege/notificationmanager is deprecated.)
         *
         * @return              The current badge number if the method is successful, @n
                                        else @c -1 if the method fails

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 8e72610..45cfae4 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -4,39 +4,28 @@ INCLUDE_DIRECTORIES(
        ${CMAKE_SOURCE_DIR}/inc
        ${CMAKE_SOURCE_DIR}/src/inc
        ${CMAKE_SOURCE_DIR}/src/core
-       /usr/include/chromium
        /usr/include/osp
        /usr/include/osp/app
        /usr/include/osp/base
        /usr/include/osp/io
-       /usr/include/osp/graphics
        /usr/include/osp/security
-
-       /usr/include
+       
        /usr/include/appfw
-       /usr/include/glib-2.0
-       /usr/lib/glib-2.0/include
-       /usr/include/chromium
-       /usr/include/dlog
-       /usr/include/dbus-1.0
        /usr/include/notification
        /usr/include/shortcut
-       /usr/lib/dbus-1.0/include
-       /usr/include/libxml2
-       /usr/include/system
        /usr/include/vconf
        /usr/include/badge
 )
 
 SET (${this_target}_SOURCE_FILES
+       FShellLockManager.cpp
        FShellNotificationManager.cpp
-       FShell_NotificationManagerImpl.cpp
        FShellNotificationRequest.cpp
-       FShell_NotificationRequestImpl.cpp
        FShellShortcutManager.cpp
-       FShell_ShortcutManagerImpl.cpp
-       FShellLockManager.cpp
        FShell_LockManagerImpl.cpp
+       FShell_NotificationManagerImpl.cpp
+       FShell_NotificationRequestImpl.cpp
+       FShell_ShortcutManagerImpl.cpp
 )
 
 ## Definitions
@@ -56,15 +45,10 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed")
 
 TARGET_LINK_LIBRARIES(${this_target} "-lpthread" )
-TARGET_LINK_LIBRARIES(${this_target} "-lchromium" )
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-application" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-app-manager" )
 TARGET_LINK_LIBRARIES(${this_target} "-lnotification" )
-TARGET_LINK_LIBRARIES(${this_target} "-lecore" )
-TARGET_LINK_LIBRARIES(${this_target} "-levas" )
-TARGET_LINK_LIBRARIES(${this_target} "-leina" )
-TARGET_LINK_LIBRARIES(${this_target} "-lecore_evas" )
 TARGET_LINK_LIBRARIES(${this_target} "-lshortcut" )
 TARGET_LINK_LIBRARIES(${this_target} "-lvconf" )
 TARGET_LINK_LIBRARIES(${this_target} "-lbadge" )

diff --git a/src/core/FShellLockManager.cpp b/src/core/FShellLockManager.cpp
index 2a5326d..3d641d1 100644 (file)
--- a/src/core/FShellLockManager.cpp
+++ b/src/core/FShellLockManager.cpp
@@ -21,15 +21,14 @@
  */
 
 #include <cstdlib>
-//#include <pthread.h>
 #include <unique_ptr.h>
-
 #include <FBaseLog.h>
 #include <FBaseSysLog.h>
 #include <FShellLockManager.h>
 #include <FShell_LockManagerImpl.h>
 
-namespace Tizen { namespace Shell {
+namespace Tizen { namespace Shell
+{
 
 LockManager* LockManager::__pTheInstance = null;
 
@@ -114,5 +113,4 @@ LockManager::Unlock(void)
        return __pLockManagerImpl->Unlock();
 }
 
-
 }} // Tizen::Shell

diff --git a/src/core/FShellNotificationManager.cpp b/src/core/FShellNotificationManager.cpp
index 38e3034..0b389a7 100644 (file)
--- a/src/core/FShellNotificationManager.cpp
+++ b/src/core/FShellNotificationManager.cpp
@@ -17,11 +17,10 @@
 
 /**
  * @file               FShellNotificationManager.cpp
- * @brief              This is the placeholder for NotificationManager class.
+ * @brief              This is the implementation for NotificationManager class.
  */
 
 #include <new>
-
 #include <FBaseSysLog.h>
 #include <FShellNotificationManager.h>
 #include <FShellIBadgeEventListener.h>

diff --git a/src/core/FShellNotificationRequest.cpp b/src/core/FShellNotificationRequest.cpp
index 3f7f025..29f16d4 100644 (file)
--- a/src/core/FShellNotificationRequest.cpp
+++ b/src/core/FShellNotificationRequest.cpp
@@ -16,22 +16,18 @@
 //
 
 /**
- * @file               FShellNotificationRequest.cpp
- * @brief              This is the placeholder for NotificationRequest class.
+ * @file       FShellNotificationRequest.cpp
+ * @brief      This is the implementation for NotificationRequest class.
  */
 
 #include <new>
-
-#include <FAppTypes.h>
-#include <FShellNotificationRequest.h>
-
 #include <FBaseSysLog.h>
+#include <FShellNotificationRequest.h>
 #include "FShell_NotificationRequestImpl.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Security;
 
-
 namespace Tizen { namespace Shell
 {
 
@@ -138,7 +134,6 @@ NotificationRequest::GetAppMessage() const
        return __pNotificationRequestImpl->GetAppMessage();
 }
 
-
 result
 NotificationRequest::SetAppMessage(const String& appMessage)
 {
@@ -227,7 +222,6 @@ NotificationRequest::SetOngoingActivityProgress(int progressValue)
        return __pNotificationRequestImpl->SetOngoingActivityProgress(progressValue);
 }
 
-
 NotificationStyle
 NotificationRequest::GetNotificationStyle(void) const
 {
@@ -242,7 +236,6 @@ NotificationRequest::SetNotificationStyle(NotificationStyle style)
        return __pNotificationRequestImpl->SetNotificationStyle(style);
 }
 
-
 Tizen::Base::Collection::IList*
 NotificationRequest::GetMessageTextListN(void) const
 {
@@ -250,7 +243,6 @@ NotificationRequest::GetMessageTextListN(void) const
        return __pNotificationRequestImpl->GetMessageTextListN();
 }
 
-
 result
 NotificationRequest::SetMessageTextList(const Tizen::Base::Collection::IList* pTextList)
 {
@@ -258,7 +250,6 @@ NotificationRequest::SetMessageTextList(const Tizen::Base::Collection::IList* pT
        return __pNotificationRequestImpl->SetMessageTextList(pTextList);
 }
 
-
 Tizen::Base::Collection::IList*
 NotificationRequest::GetMessageThumbnailFilePathListN(void) const
 {
@@ -266,7 +257,6 @@ NotificationRequest::GetMessageThumbnailFilePathListN(void) const
        return __pNotificationRequestImpl->GetMessageThumbnailFilePathListN();
 }
 
-
 result
 NotificationRequest::SetMessageThumbnailFilePathList(const Tizen::Base::Collection::IList* pThumbnailPathList)
 {
@@ -274,7 +264,6 @@ NotificationRequest::SetMessageThumbnailFilePathList(const Tizen::Base::Collecti
        return __pNotificationRequestImpl->SetMessageThumbnailFilePathList(pThumbnailPathList);
 }
 
-
 Tizen::Base::String
 NotificationRequest::GetNotificationCountText(void) const
 {
@@ -282,7 +271,6 @@ NotificationRequest::GetNotificationCountText(void) const
        return __pNotificationRequestImpl->GetNotificationCountText();
 }
 
-
 result
 NotificationRequest::SetNotificationCountText(const Tizen::Base::String& notificationCountText)
 {
@@ -290,7 +278,6 @@ NotificationRequest::SetNotificationCountText(const Tizen::Base::String& notific
        return __pNotificationRequestImpl->SetNotificationCountText(notificationCountText);
 }
 
-
 Tizen::Base::String
 NotificationRequest::GetBackgroundImageFilePath(void) const
 {
@@ -298,7 +285,6 @@ NotificationRequest::GetBackgroundImageFilePath(void) const
        return __pNotificationRequestImpl->GetBackgroundImageFilePath();
 }
 
-
 result
 NotificationRequest::SetBackgroundImageFilePath(const Tizen::Base::String& imagePath)
 {

diff --git a/src/core/FShellShortcutManager.cpp b/src/core/FShellShortcutManager.cpp
index fd2b6e1..06763a4 100644 (file)
--- a/src/core/FShellShortcutManager.cpp
+++ b/src/core/FShellShortcutManager.cpp
@@ -21,13 +21,10 @@
  */
 
 #include <unique_ptr.h>
-
 #include <shortcut.h>
-
 #include <FBaseSysLog.h>
 #include <FShellShortcutManager.h>
 #include <FShellIShortcutRequestListener.h>
-
 #include <FApp_Types.h>
 #include <FApp_AppInfo.h>
 #include <FBase_StringConverter.h>
@@ -119,5 +116,4 @@ ShortcutManager::RemoveShortcutRequestListener(IShortcutRequestListener& listene
        return __pShortcutManagerImpl->RemoveShortcutRequestListener(listener);
 }
 
-
 }} // Tizen::Shell

diff --git a/src/core/FShell_LockManagerImpl.cpp b/src/core/FShell_LockManagerImpl.cpp
index 8d6f369..7f6be4d 100644 (file)
--- a/src/core/FShell_LockManagerImpl.cpp
+++ b/src/core/FShell_LockManagerImpl.cpp
@@ -1,8 +1,23 @@
-/*
- * FShell_LockManagerImpl.cpp
- *
- *  Created on: Feb 15, 2013
- *      Author: jungmin76park
+//
+// Open Service Platform
+// Copyright (c) 2013 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file       FShell_LockManagerImpl.cpp
+ * @brief      This is the implementation for the _LockManagerImpl class.
  */
 
 #include <vconf.h>
@@ -10,7 +25,8 @@
 #include <FBaseSysLog.h>
 #include <FShell_LockManagerImpl.h>
 
-namespace Tizen { namespace Shell {
+namespace Tizen { namespace Shell
+{
 
 #define VCONFKEY_IDLE_LOCK_STATE                    "memory/idle_lock/state"
 #define VCONFKEY_SETAPPL_PREFIX  "db/setting"
@@ -106,5 +122,4 @@ _LockManagerImpl::Unlock(void)
        return E_SUCCESS;
 }
 
-
 }} // Tizen::Shell

diff --git a/src/core/FShell_NotificationManagerImpl.cpp b/src/core/FShell_NotificationManagerImpl.cpp
index 18e3a25..44ef330 100644 (file)
--- a/src/core/FShell_NotificationManagerImpl.cpp
+++ b/src/core/FShell_NotificationManagerImpl.cpp
@@ -16,42 +16,31 @@
 //
 
 /**
- * @file               FShell_NotificationManagerImpl.cpp
- * @brief              This is the placeholder for _NotificationManagerImpl class.
+ * @file       FShell_NotificationManagerImpl.cpp
+ * @brief      This is the implementation for _NotificationManagerImpl class.
  */
 
 #include <unique_ptr.h>
-#include <appsvc/appsvc.h>
-#include <bundle.h>
 #include <notification/notification.h>
 #include <appfw/app.h>
 #include <appfw/app_manager.h>
-#include <appfw/app_ui_notification.h>
 #include <badge.h>
-
 #include <FBaseSysLog.h>
-#include <FApp.h>
+#include <FIoFile.h>
+#include <FAppApp.h>
 #include <FShellNotificationManager.h>
 #include <FShellNotificationRequest.h>
 #include <FShellIBadgeEventListener.h>
-
-#include "FBase_StringConverter.h"
-#include "FApp_AppInfo.h"
-#include "FApp_Aul.h"
-#include "FIoFile.h"
-#include "FAppPkg_PackageManagerImpl.h"
-#include "FApp_AppArg.h"
-#include "FAppPkgPackageAppInfo.h"
-#include "FAppPkg_PackageAppInfoImpl.h"
+#include <FBase_StringConverter.h>
+#include <FApp_Aul.h>
+#include <FApp_AppArg.h>
 #include "FShell_NotificationManagerImpl.h"
 #include "FShell_NotificationRequestImpl.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::App;
-using namespace Tizen::App::Package;
 using namespace Tizen::Io;
-using namespace Tizen::Shell;
 
 extern "C" int service_create_request(bundle *data, service_h *service);
 extern "C" int service_to_bundle(service_h service, bundle** data);

diff --git a/src/core/FShell_NotificationRequestImpl.cpp b/src/core/FShell_NotificationRequestImpl.cpp
index 42898dd..1d82502 100644 (file)
--- a/src/core/FShell_NotificationRequestImpl.cpp
+++ b/src/core/FShell_NotificationRequestImpl.cpp
@@ -16,24 +16,17 @@
 //
 
 /**
- * @file               FShell_NotificationRequestImpl.cpp
- * @brief              This is the placeholder for _NotificationRequestImpl class.
+ * @file       FShell_NotificationRequestImpl.cpp
+ * @brief      This is the implementation for _NotificationRequestImpl class.
  */
 
 #include <new>
 #include <unique_ptr.h>
-#include <FBaseBoolean.h>
-#include <FBaseInteger.h>
 #include <FBaseSysLog.h>
-#include <FAppTypes.h>
 #include <FIoFile.h>
-#include <FShellNotificationManager.h>
 #include <FShellNotificationRequest.h>
-
-#include <FBaseInternalTypes.h>
 #include "FShell_NotificationRequestImpl.h"
 
-
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Io;

diff --git a/src/core/FShell_ShortcutManagerImpl.cpp b/src/core/FShell_ShortcutManagerImpl.cpp
index 22891b0..fe72ae9 100644 (file)
--- a/src/core/FShell_ShortcutManagerImpl.cpp
+++ b/src/core/FShell_ShortcutManagerImpl.cpp
@@ -21,9 +21,7 @@
  */
 
 #include <unique_ptr.h>
-
 #include <shortcut.h>
-
 #include <FBaseSysLog.h>
 #include <FBase.h>
 #include <FApp.h>
@@ -175,5 +173,4 @@ _ShortcutManagerImpl::SetAppWidgetRequestHandlerCallback(request_cb_t pAppWidget
        __pAppWidgetRequestHandlerCallback = pAppWidgetRequestHandlerFn;
 }
 
-
 }} // Tizen::Shell