Merge branch 'tizen' of ssh://review.tizen.org:29418/profile/tv/apps/native/filebrows...

Signed-off-by: Kim Youngjin <yj21c.kim@samsung.com>

diff --git a/include/FbAllLayout.h b/include/FbAllLayout.h
index 03f2be1..9f1e831 100644 (file)
--- a/include/FbAllLayout.h
+++ b/include/FbAllLayout.h
@@ -26,7 +26,7 @@ public:
        bool Create(CLayoutMgr *mgr, void *data);
        virtual void Destroy(void);
 
-       void SetFocus(bool flag);
+       void SetFocus(Eina_Bool flag);
        void Action(void);
        void SetUpdateFlag(bool flag);
 };

diff --git a/include/FbMusicLayout.h b/include/FbMusicLayout.h
index 7fba53f..13e9d0a 100644 (file)
--- a/include/FbMusicLayout.h
+++ b/include/FbMusicLayout.h
@@ -26,7 +26,7 @@ public:
        bool Create(CLayoutMgr *mgr, void *data);
        virtual void Destroy(void);
 
-       void SetFocus(bool flag);
+       void SetFocus(Eina_Bool flag);
        void Action(void);
        void SetUpdateFlag(bool flag);
 };

diff --git a/include/FbPhotoLayout.h b/include/FbPhotoLayout.h
index 6e16d16..aa81e35 100644 (file)
--- a/include/FbPhotoLayout.h
+++ b/include/FbPhotoLayout.h
@@ -26,7 +26,7 @@ public:
        bool Create(CLayoutMgr *mgr, void *data);
        virtual void Destroy(void);
 
-       void SetFocus(bool flag);
+       void SetFocus(Eina_Bool flag);
        void Action(void);
        void SetUpdateFlag(bool flag);
 };

diff --git a/include/FbVideoLayout.h b/include/FbVideoLayout.h
index 271bb4a..b54e2b7 100644 (file)
--- a/include/FbVideoLayout.h
+++ b/include/FbVideoLayout.h
@@ -26,7 +26,7 @@ public:
        bool Create(CLayoutMgr *mgr, void *data);
        virtual void Destroy(void);
 
-       void SetFocus(bool flag);
+       void SetFocus(Eina_Bool flag);
        void Action(void);
        void SetUpdateFlag(bool flag);
 };

diff --git a/src/layouts/FbAllLayout.cpp b/src/layouts/FbAllLayout.cpp
index 3b6d31e..a0c367d 100644 (file)
--- a/src/layouts/FbAllLayout.cpp
+++ b/src/layouts/FbAllLayout.cpp
@@ -176,7 +176,7 @@ void CFbAllLayout::Destroy(void)
 }
 
 
-void CFbAllLayout::SetFocus(bool flag)
+void CFbAllLayout::SetFocus(Eina_Bool flag)
 {
        ASSERT(m);
        _DBG();

diff --git a/src/layouts/FbMusicLayout.cpp b/src/layouts/FbMusicLayout.cpp
index 5d8a413..ebc64ed 100644 (file)
--- a/src/layouts/FbMusicLayout.cpp
+++ b/src/layouts/FbMusicLayout.cpp
@@ -176,7 +176,7 @@ void CFbMusicLayout::Destroy(void)
 }
 
 
-void CFbMusicLayout::SetFocus(bool flag)
+void CFbMusicLayout::SetFocus(Eina_Bool flag)
 {
        ASSERT(m);
        _DBG();

diff --git a/src/layouts/FbPhotoLayout.cpp b/src/layouts/FbPhotoLayout.cpp
index bda1bd1..eb6729f 100644 (file)
--- a/src/layouts/FbPhotoLayout.cpp
+++ b/src/layouts/FbPhotoLayout.cpp
@@ -176,7 +176,7 @@ void CFbPhotoLayout::Destroy(void)
 }
 
 
-void CFbPhotoLayout::SetFocus(bool flag)
+void CFbPhotoLayout::SetFocus(Eina_Bool flag)
 {
        ASSERT(m);
        _DBG();

diff --git a/src/layouts/FbVideoLayout.cpp b/src/layouts/FbVideoLayout.cpp
index 333c8ed..11932e8 100644 (file)
--- a/src/layouts/FbVideoLayout.cpp
+++ b/src/layouts/FbVideoLayout.cpp
@@ -176,7 +176,7 @@ void CFbVideoLayout::Destroy(void)
 }
 
 
-void CFbVideoLayout::SetFocus(bool flag)
+void CFbVideoLayout::SetFocus(Eina_Bool flag)
 {
        ASSERT(m);
        _DBG();

diff --git a/src/main.cpp b/src/main.cpp
index f10b227..4c19c1e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,6 +20,8 @@
 #include <Eina.h>
 #include "dbg.h"
 #include "define.h"
+
+#include <AppCommon.h>
 #include "BaseApp.h"
 
 #include <BaseView.h>