1.Set as Contact fix 2.File size limit set to 255

[apps/osp/ImageViewer.git] / inc / IvImageViewerPresentationModel.h

diff --git a/inc/IvImageViewerPresentationModel.h b/inc/IvImageViewerPresentationModel.h
index 112ae54..5e4fcfc 100644 (file)
--- a/inc/IvImageViewerPresentationModel.h
+++ b/inc/IvImageViewerPresentationModel.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
@@ -22,14 +22,7 @@
 #ifndef _IV_VIEWER_PRESENTATION_MODEL_H_
 #define _IV_VIEWER_PRESENTATION_MODEL_H_
 
-#include <FApp.h>
-#include <FAppIAppControlEventListener.h>
-#include <FBase.h>
-#include <FBaseColArrayList.h>
 #include <FContent.h>
-#include <FGraphics.h>
-#include <FIo.h>
-#include <FUi.h>
 #include "IvImageProviderEventListener.h"
 #include "IvTypes.h"
 
@@ -48,17 +41,17 @@ public:
        static ImageViewerPresentationModel* GetInstance();
 
 public:
-       result AddListener(IImageViewerEventListener* listener);
+       result AddListener(IImageViewerEventListener* pListener);
        result RemoveListener(IImageViewerEventListener& listner);
 
-       result AddFileUpdateListener(IFileUpdateEventListener* listener);
+       result AddFileUpdateListener(IFileUpdateEventListener* pListener);
        result RemoveFileUpdateListener(IFileUpdateEventListener& listner);
 
-       void ClearImageRequests(bool appTerminating = false);
+       void ClearImageRequests(bool isAppTerminating = false);
        void DeleteFilePathAt(const int index);
        void UpdateFilePathAt(const int index, const Tizen::Base::String& filePath);
        Tizen::Base::String GetFilePathAt(const int index) const;
-       Tizen::Base::Collection::ArrayList* GetImageCache() const;
+       Tizen::Base::Collection::ArrayList* GetImageCache(void) const;
        ImageInfo* GetImageCacheAt(const int index) const;
        void AddImageCache(const Tizen::Base::String& filePath);
 
@@ -66,8 +59,9 @@ public:
        Tizen::Base::String GetType(void) const;
        int GetStartIndex(void) const;
 
-       Tizen::Base::String GetFileName(const Tizen::Base::String& filePath, bool checkExe = false) const;
-       void RequestImage(const Tizen::Base::String& filePath) const;
+       Tizen::Base::String GetFileName(const Tizen::Base::String& filePath, bool isCheckExe = false) const;
+       void RequestImage(const Tizen::Base::String& filePath);
+       Tizen::Graphics::Bitmap* GetImage(const Tizen::Base::String& filePath);
        Tizen::Content::ContentId GetFileContentId(const Tizen::Base::String& filePath) const;
 
        int GetDurationOfSlideShow(void) const;
@@ -79,13 +73,11 @@ public:
 
        virtual void OnImageReceivedN(Tizen::Base::Runtime::IEventArg& eventArg);
 
-       //From IContentUpdateEventListener
        virtual void OnContentFileCreated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);
        virtual void OnContentFileUpdated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);
        virtual void OnContentFileDeleted(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);
        virtual void OnContentDirectoryScanCompleted(const Tizen::Base::String& directoryPath, result r);
 
-
 private:
        ImageViewerPresentationModel(void);
        ImageViewerPresentationModel(const ImageViewerPresentationModel&);
@@ -96,7 +88,7 @@ private:
        static void CreateInstance(void);
        static void DestroyInstance(void);
 
-       void LoadSettingValue();
+       void LoadSettingValue(void);
        int GetImageCacheIndex(const Tizen::Base::String& );
 
 private:
@@ -113,10 +105,10 @@ private:
        SlideShowTransitionEffect __transitionEffectOfSlideShow;
        Tizen::Content::ContentManager* __pCntMgr;
        SettingPresentationModel* __pSettingPresentationModel;
-       bool __ivTriggeredEvent;
+       bool __isIvTriggeredEvent;
        short __contentFileEventType;
        Tizen::Content::ContentId __contentId;
-       bool __ivTriggeredDeleteEvent;
+       bool __isIvTriggeredDeleteEvent;
 };
 
 #endif /* _IV_VIEWER_PRESENTATION_MODEL_H_ */