Merge "Fix memory leaks" into tizen_2.2

[apps/osp/Gallery.git] / inc / GlAlbumListPresentationModel.h

diff --git a/inc/GlAlbumListPresentationModel.h b/inc/GlAlbumListPresentationModel.h
index 37706e7..8bbf574 100644 (file)
--- a/inc/GlAlbumListPresentationModel.h
+++ b/inc/GlAlbumListPresentationModel.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
 //
@@ -23,13 +23,7 @@
 #define _GL_ALBUM_LIST_PRESENTATION_MODEL_H_
 
 #include <FApp.h>
-#include <FBase.h>
-#include <FContent.h>
-#include <FCntIContentScanListener.h>
-#include <FGraphics.h>
-#include <FIo.h>
 #include <FSystem.h>
-#include <FUi.h>
 #include "GlAlbumEventListener.h"
 #include "GlFormContentUpdateEventListener.h"
 #include "GlIContentFileUpdateManager.h"
@@ -42,16 +36,14 @@ class AlbumInfo;
 class IAlbumRenameEventListener;
 
 class AlbumListPresentationModel
-       : public Tizen::Base::Object
-       , public Tizen::Content::IContentScanListener
-       , public Tizen::System::IDeviceEventListener
-       , public IContentFileUpdateManager
+       : public IContentFileUpdateManager
        , public IThumbnailEventListener
+       , public Tizen::Base::Object
+       , public Tizen::System::IDeviceEventListener
 {
 public:
        static AlbumListPresentationModel* GetInstance(void);
 
-public:
        result AddPresentationModelListener(IAlbumEventListener* listener);
        result RemovePresentationModelListener(IAlbumEventListener& listner);
 
@@ -60,19 +52,18 @@ public:
 
        virtual result RotateImage(int index, RotateMode rotateMode);
        virtual void RequestThumbnail(int index){};
-       void RequestThumbnail(const int folderIndex, int pathIndex);
-       void CancelThumbnailRequest(const int folderIndex);
-       void ClearThumbnailRequests(bool appTerminating = false);
+       void RequestThumbnail(const int folderIndex, const int pathIndex);
+       void ClearThumbnailRequests(const bool appTerminating = false);
        result StartAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId,
                        const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType,
                        const Tizen::Base::Collection::HashMap* pDataList, Tizen::App::IAppControlResponseListener* pListener);
 
        void InitializeAlbumInfoList(const Tizen::Content::ContentType& contentType);
        void CallAlbumChangedEvent(void);
-       int GetFolderCount(void);
+       int GetFolderCount(void) const;
 
-       Tizen::Graphics::Bitmap* CreateMergeBitmapN(int index);
-       Tizen::Base::Collection::IList* GetAlbumInfoList(void);
+       Tizen::Graphics::Bitmap* CreateMergeBitmapN(const int index);
+       Tizen::Base::Collection::IList* GetAlbumInfoList(void) const;
 
        AppControlMode GetAppControlMode(void) const;
        AppControlMediaType GetAppControlMediaType(void) const;
@@ -80,25 +71,25 @@ public:
 
        result RenameAlbum(const Tizen::Base::String&, const Tizen::Base::String&, IAlbumRenameEventListener*);
 
-       virtual Tizen::Base::Collection::IList* GetContentIdListAtIndexN(const Tizen::Base::Collection::IList& indexList);
+       virtual Tizen::Base::Collection::IList* GetContentIdListAtIndexN(const Tizen::Base::Collection::IList& indexList) const;
        virtual result DeleteContentFile(const Tizen::Content::ContentId& contentId);
 
        virtual void OnThumbnailReceivedN(Tizen::Base::Runtime::IEventArg& eventArg);
 
-       virtual void OnContentScanCompleted (RequestId reqId, const Tizen::Base::String &scanPath, result r);
+       void OnContentScanCompleted(const Tizen::Base::String &scanPath);\r
 
-       void OnContentCreated();
-       void OnContentUpdated();
-       void OnContentDeleted();
+       void OnContentCreated(void);
+       void OnContentUpdated(void);
+       void OnContentDeleted(void);
 
        virtual void OnDeviceStateChanged(Tizen::System::DeviceType deviceType, const Tizen::Base::String& state);
-       void SetUpdateProgressStatus(bool status);
+       void SetUpdateProgressStatus(const bool status);
 
 private:
        AlbumListPresentationModel(void);
        virtual ~AlbumListPresentationModel(void);
        AlbumListPresentationModel(const AlbumListPresentationModel&);
-       const AlbumListPresentationModel& operator = (const AlbumListPresentationModel&);
+       const AlbumListPresentationModel& operator =(const AlbumListPresentationModel&);
 
        result Construct(void);
        static void CreateInstance(void);
@@ -108,7 +99,7 @@ private:
                        const Tizen::Graphics::Rectangle& rectNew);
        void DrawFontImage(Tizen::Graphics::Canvas& canvas, AlbumInfo* pAlbumInfo, int index);
 
-       Tizen::Base::String GetDirectoryName(Tizen::Base::String& directoryPath);
+       Tizen::Base::String GetDirectoryName(Tizen::Base::String& directoryPath) const;
        Tizen::Base::Collection::IList* GetContentIdListInDirectoryN(const Tizen::Base::String& directoryPath,
                        Tizen::Content::ContentType contentType) const;
        Tizen::Base::String GetDirectoryNameFromFullPath(const Tizen::Base::String& fullPath) const;
@@ -128,6 +119,7 @@ private:
        AppControlMediaType __appControlMediaType;
        AppControlSelectionMode __appControlSelectionMode;
        bool __updateProgressStatus;
+       Tizen::Base::String __renameNewPath;\r
 };
 
 #endif /* _GL_ALBUM_LIST_PRESENTATION_MODEL_H_ */