[MVC]Removed Unnecessary Header

Change-Id: I6c827ec7e4cbe78d45b431fd520b868e52189544
Signed-off-by: Chandan <ch.kumar@samsung.com>

diff --git a/inc/debug.h b/inc/debug.h
index 0d250d7..d8214eb 100644 (file)
--- a/inc/debug.h
+++ b/inc/debug.h
@@ -19,19 +19,6 @@
 
 #include <assert.h>
 
-
-/*
-       Category :
-               FATAL
-               ERROR
-               WARN
-               HIGH
-               MED
-               LOW
-               DEBUG
-*/
-
-
 enum {
        DBG_MSG_LOW                     = 0,
        DBG_MSG_MED             = 1,

diff --git a/inc/ivug-base.h b/inc/ivug-base.h
index ae3531a..edaf653 100644 (file)
--- a/inc/ivug-base.h
+++ b/inc/ivug-base.h
@@ -18,9 +18,7 @@
 #define __IVUG_BASE_H__
 
 #include <Elementary.h>
-#include "ivug-parameter.h"
 #include "ivug-slideshow-view.h"
-#include "ivug-crop-ug.h"
 #include "ivug-main-view.h"
 
 typedef struct _ug_data ug_data;

diff --git a/inc/ivug-callback.h b/inc/ivug-callback.h
index 535ce0e..bad5981 100644 (file)
--- a/inc/ivug-callback.h
+++ b/inc/ivug-callback.h
@@ -31,10 +31,6 @@ extern "C" {
 
 callback_handle_t * ivug_callback_register(void);
 
-void ivug_callback_set_callback(callback_handle_t *handle, callback_func_t callback, void *data);
-
-void ivug_callback_call(callback_handle_t *handle, void *data1, void *data2, void *data3);
-
 void ivug_callback_unregister(callback_handle_t *handle);
 
 #ifdef __cplusplus

diff --git a/inc/ivug-common.h b/inc/ivug-common.h
index bc77f7e..421351a 100644 (file)
--- a/inc/ivug-common.h
+++ b/inc/ivug-common.h
@@ -17,13 +17,11 @@
 #ifndef __IVUG_COMMON_H__
 #define __IVUG_COMMON_H__
 
+#include <Elementary.h>
+#include <assert.h>
 #include "ivug-define.h"
 #include "ivug-datatypes.h"
 #include "ivug-uuid.h"
-
-#include <Elementary.h>
-#include <assert.h>
-
 #include "ivug-debug.h"
 #include "ivug-string.h"
 #include "ivug-util.h"
@@ -39,22 +37,6 @@
 #define IMAGE_PATH                                             full_path(UG_RES_PATH, "edje/images")
 #define DATA_PATH                                              DATADIR"/"
 
-/*
-       Home screen and Lock screen image should be put in DATA_PATH.
-*/
-
-
-#define NAVI_OPTION_BTN_STYLE  "naviframe/title/default"//"multiline"
-
-#define WHITE_THEME
-
-#ifdef WHITE_THEME
-#define IVUG_DEFAULT_BG_COLOR          249
-#else
-#define IVUG_DEFAULT_BG_COLOR          48
-#endif
-
-#define USE_DEFAULT_DOWNLOADS_FOLDER
 
 #define DEFAULT_THUMBNAIL              "/opt/usr/share/media/.thumb/thumb_default.png"
 #define DEFAULT_THUMBNAIL_PATH                 full_path(IMAGE_PATH, "/T01_Nocontents_broken.png")
@@ -65,16 +47,5 @@
 
 #define MENUBAR_TIMEOUT_SEC (2.0f)
 
-/*
-       Final image path
-*/
-#define IVUG_HOME_SCREEN_PATH          DATA_PATH"/.homescreen.jpg";
-#define IVUG_LOCK_SCREEN_PATH          DATA_PATH"/.lockscreen.jpg";
-
-/*
-       Screen path for APPSVC
-*/
-#define IVUG_APPSVC_HOME_SCREEN_PATH   DATA_PATH"/.iv_homescreen.jpg";
-
 #endif /* __IVUG_COMMON_H__ */
 

diff --git a/inc/ivug-config.h b/inc/ivug-config.h
index 6601eb3..0135004 100644 (file)
--- a/inc/ivug-config.h
+++ b/inc/ivug-config.h
@@ -17,8 +17,6 @@
 #ifndef __IVUG_CONFIG_H__
 #define __IVUG_CONFIG_H__
 
-#include "ivug-define.h"
-
 typedef enum {
        SLIDE_SHOW_MODE_NORMAL                  = 0x00,
        SLIDE_SHOW_MODE_REPEAT                  = 0x01,
@@ -60,9 +58,6 @@ void ivug_config_get_slideshow_setting(slide_show_mode * /* OUT */ mode,
                                                                           double * /* OUT */ interval_time,
                                                                           ivug_effect_type * /* OUT */ effect_type);
 
-bool ivug_config_set_playspeed(eConfigPlaySpeed speed);
-//bool ivug_config_get_playspeed(eConfigPlaySpeed *speed);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/inc/ivug-context.h b/inc/ivug-context.h
index a419d8c..4969644 100644 (file)
--- a/inc/ivug-context.h
+++ b/inc/ivug-context.h
@@ -18,18 +18,13 @@
 #ifndef __IVUG_CONTEXT_H__
 #define __IVUG_CONTEXT_H__
 
-#include "ivug-define.h"
-
+#include <stdbool.h>
+#include <app.h>
 #include "ivug-callback.h"
-
 #include "ivug-language-mgr.h"
 #include "ivug-common.h"
-#include "ivug-util.h"
-
 #include "ivug-db.h"
 
-#include "ivug-language-mgr.h"
-
 /*
        Managing context(instance)
 */

diff --git a/inc/ivug-crop-circular.h b/inc/ivug-crop-circular.h
index 0301c78..1fc960f 100644 (file)
--- a/inc/ivug-crop-circular.h
+++ b/inc/ivug-crop-circular.h
@@ -17,8 +17,6 @@
 #ifndef __IVUG_CROP_CIRCULAR_H__
 #define __IVUG_CROP_CIRCULAR_H__
 
-#include "ivug-crop-view.h"
-#include "ivug-main-view.h"
 #include "ivug-main-view-priv.h"
 
 #ifdef __cplusplus

diff --git a/inc/ivug-crop-ug.h b/inc/ivug-crop-ug.h
index 337af32..68eb3d1 100644 (file)
--- a/inc/ivug-crop-ug.h
+++ b/inc/ivug-crop-ug.h
@@ -17,8 +17,6 @@
 #ifndef __IVUG_CROP_UG_H__
 #define __IVUG_CROP_UG_H__
 
-#include "ivug-crop-view.h"
-#include "ivug-main-view.h"
 #include "ivug-main-view-priv.h"
 
 #ifdef __cplusplus

diff --git a/inc/ivug-data-list.h b/inc/ivug-data-list.h
index 0506253..06a12a0 100644 (file)
--- a/inc/ivug-data-list.h
+++ b/inc/ivug-data-list.h
@@ -17,7 +17,6 @@
 #ifndef __IVUG_DATA_LIST_H__
 #define __IVUG_DATA_LIST_H__
 
-#include "ivug-define.h"
 #include "ivug-medialist.h"
 
 #ifdef __cplusplus

diff --git a/inc/ivug-db.h b/inc/ivug-db.h
index 6e27522..4352075 100644 (file)
--- a/inc/ivug-db.h
+++ b/inc/ivug-db.h
@@ -17,10 +17,7 @@
 #ifndef __IVUG_DB_H__
 #define __IVUG_DB_H__
 
-#include <stdbool.h>
-
-#include "ivug-datatypes.h"
-#include <time.h>              // localtime_r
+#include <time.h>
 #include "ivug-uuid.h"
 
 #ifdef __cplusplus

diff --git a/inc/ivug-dir.h b/inc/ivug-dir.h
index 27fffcf..38bc8f3 100644 (file)
--- a/inc/ivug-dir.h
+++ b/inc/ivug-dir.h
@@ -31,12 +31,6 @@ typedef void (*EnumFilesCB)(const char *fname, void *data);
 */
 bool EnumFilesInDir(const char *dir, EnumFilesCB pFunc, void *data);
 
-/*
-       Retrieve file count in @dir.
-       return -1 when error occured.
-*/
-int GetFilesCountInDir(const char *dir);
-
 
 #ifdef __cplusplus
 }

diff --git a/inc/ivug-ext-ug.h b/inc/ivug-ext-ug.h
index df2824f..1f06b00 100644 (file)
--- a/inc/ivug-ext-ug.h
+++ b/inc/ivug-ext-ug.h
@@ -19,7 +19,6 @@
 
 #include <stdbool.h>
 #include <notification.h>
-#include "ivug-define.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/inc/ivug-file-util.h b/inc/ivug-file-util.h
index bc832fe..2987cb4 100644 (file)
--- a/inc/ivug-file-util.h
+++ b/inc/ivug-file-util.h
@@ -22,8 +22,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <Elementary.h>
-
+#include <unistd.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,7 +31,7 @@ extern "C" {
 const char* ivug_file_get(const char path[]);
 char* ivug_dir_get(const char path[]);
 int ivug_file_exists(const char *path);
-Eina_Bool ivug_is_dir(const char *path);
+int ivug_is_dir(const char *path);
 int ivug_is_dir_empty(const char *path);
 int ivug_mkdir(const char *dir);
 int ivug_mkpath(const char *path);

diff --git a/inc/ivug-filter.h b/inc/ivug-filter.h
index b7ed37a..fd89aa8 100644 (file)
--- a/inc/ivug-filter.h
+++ b/inc/ivug-filter.h
@@ -18,7 +18,6 @@
 #define __IVUG_FILTER_H__
 
 #include <Eina.h>
-#include "ivug-define.h"
 
 typedef enum {
        FILTER_DB,

diff --git a/inc/ivug-main-view-menu.h b/inc/ivug-main-view-menu.h
index 37451f5..a49a1d6 100644 (file)
--- a/inc/ivug-main-view-menu.h
+++ b/inc/ivug-main-view-menu.h
@@ -17,7 +17,6 @@
 #ifndef __IVUG_MAINVIEW_MENU_H__
 #define __IVUG_MAINVIEW_MENU_H__
 
-#include "ivug-define.h"
 #include "ivug-main-view.h"
 
 #define MAX_BUTTON (3)

diff --git a/inc/ivug-main-view-toolbar.h b/inc/ivug-main-view-toolbar.h
index 3ac9cf3..9b6b530 100644 (file)
--- a/inc/ivug-main-view-toolbar.h
+++ b/inc/ivug-main-view-toolbar.h
@@ -17,6 +17,7 @@
 #ifndef __IVUG_MAIN_VIEW_TOOLBAR_H__
 #define __IVUG_MAIN_VIEW_TOOLBAR_H__
 
+#include "ivug-main-view-priv.h"
 /*
        Enable / Disable buttons on tool bar
 */

diff --git a/inc/ivug-main-view.h b/inc/ivug-main-view.h
index 66509b7..a91d882 100644 (file)
--- a/inc/ivug-main-view.h
+++ b/inc/ivug-main-view.h
@@ -18,11 +18,8 @@
 #define __IVUG_MAIN_VIEWER_H__
 
 #include "ivug-common.h"
-#include "ivug-parameter.h"
-#include "ivug-medialist.h"
 #include "ivug-base.h"
 
-
 #define MAX_CTRL_ITEM_CNT 5
 
 //control bar type

diff --git a/inc/ivug-mediadata.h b/inc/ivug-mediadata.h
index fdf25ae..5027394 100644 (file)
--- a/inc/ivug-mediadata.h
+++ b/inc/ivug-mediadata.h
@@ -17,8 +17,6 @@
 #ifndef __IVUG_MEDIADATA_H__
 #define __IVUG_MEDIADATA_H__
 
-#include "ivug-define.h"
-
 #include "ivug-media.h"
 
 #ifdef __cplusplus

diff --git a/inc/ivug-medialist.h b/inc/ivug-medialist.h
index c25c48a..04c28fa 100644 (file)
--- a/inc/ivug-medialist.h
+++ b/inc/ivug-medialist.h
@@ -17,14 +17,9 @@
 #ifndef __IVUG_MEDIALIST_H__
 #define __IVUG_MEDIALIST_H__
 
-#include "ivug-define.h"
-#include "ivug-datatypes.h"
 #include "ivug-media.h"
-
 #include "ivug-filter.h"
 
-//typedef void *Media_Item;
-//typedef void Media_List;
 typedef struct _Media_Data Media_Data;
 
 typedef bool (*ivug_medialist_cb)(Media_List *mList, void *data);

diff --git a/inc/ivug-parameter.h b/inc/ivug-parameter.h
index f07ad52..1bae15b 100644 (file)
--- a/inc/ivug-parameter.h
+++ b/inc/ivug-parameter.h
@@ -20,8 +20,6 @@
 #include <stdbool.h>
 #include <app.h>
 #include <Elementary.h>
-
-#include "ivug-define.h"
 #include "ivug-datatypes.h"
 #include "ivug-filter.h"
 

diff --git a/inc/ivug-photocam.h b/inc/ivug-photocam.h
index 349a035..b5a44e6 100644 (file)
--- a/inc/ivug-photocam.h
+++ b/inc/ivug-photocam.h
@@ -17,9 +17,7 @@
 #ifndef __IVUG_PHOTOCAM_H__
 #define __IVUG_PHOTOCAM_H__
 
-#include "ivug-common.h"
-#include "ivug-parameter.h"
-#include "ivug-medialist.h"
+//#include "ivug-common.h"
 #include "Evas.h"
 enum {
        PC_POSITION_LEFT = 0,

diff --git a/inc/ivug-popup.h b/inc/ivug-popup.h
index 99f802f..99f8c16 100644 (file)
--- a/inc/ivug-popup.h
+++ b/inc/ivug-popup.h
@@ -18,7 +18,6 @@
 #define __IVUG_POPUP_H__
 
 #include "ivug-common.h"
-//#include "ivug-widgets.h"
 
 typedef enum _Popup_Response {
        POPUP_RESPONSE_NONE = -1,
@@ -50,12 +49,6 @@ Evas_Object* ivug_longpress_popup_show(Evas_Object *parent, int x, int y, bool b
 Evas_Object* ivug_deletepopup_show(Evas_Object* parent,
                                                                   const char* file_type, Evas_Smart_Cb response, void* user_data);
 
-Evas_Object *ivug_tag_buddy_access_popup_show(Evas_Object *parent, Evas_Smart_Cb check_response,
-                                                                                         Evas_Smart_Cb response, void *data);
-
-Evas_Object *ivug_nearby_popup_show(Evas_Object *parent, Evas_Smart_Cb check_response, bool state,
-                                                                       Evas_Smart_Cb response, void *data);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/inc/ivug-slider-new.h b/inc/ivug-slider-new.h
index cbbe91e..4197686 100644 (file)
--- a/inc/ivug-slider-new.h
+++ b/inc/ivug-slider-new.h
@@ -17,8 +17,6 @@
 #ifndef __IVUG_SLIDER_NEW_H__
 #define __IVUG_SLIDER_NEW_H__
 
-#include "ivug-define.h"
-
 #include <Elementary.h>
 #include "ivug-media.h"
 

diff --git a/inc/ivug-slideshow-priv.h b/inc/ivug-slideshow-priv.h
index ca8dc54..3762d78 100644 (file)
--- a/inc/ivug-slideshow-priv.h
+++ b/inc/ivug-slideshow-priv.h
@@ -16,26 +16,10 @@
 
 #pragma once
 
-// Slide Show
-
-/*
-       Start slide show.
-
-       if bSlideFirst == EINA_TRUE, slide and then wait interval time
-       if bSlideFirst == EINA_FALSE, wait interval time and then slide
-*/
 #include <Elementary.h>
-#include <player.h>
-#include <glib.h>
-
-#include "ivug-define.h"
-#include "ivug-medialist.h"
-#include "ivug-config.h"
 #include "ivug-effect.h"
 #include "ivug-main-view.h"
 
-//using namespace std;
-
 #define DATA_PATH                                              DATADIR"/"
 
 typedef struct {
@@ -81,11 +65,9 @@ typedef struct _SlideShow {
        Ecore_Event_Handler *visibility_handler;
 
        Media_Item *cur_item;
-       GList *face_record_list;
        void *dali_viewer_handle;       /*3D slidehshow image view handle*/
        Media_Item *downloading_item;   /* only used for web image*/
        int xPixmapId;
-       player_h vmpHandle;                     /*Used for video and music*/
 
        Slide_Layout sLayout[2];
        Evas_Object *pauseLayout;

diff --git a/inc/ivug-slideshow-view.h b/inc/ivug-slideshow-view.h
index 02199ec..5193169 100644 (file)
--- a/inc/ivug-slideshow-view.h
+++ b/inc/ivug-slideshow-view.h
@@ -19,10 +19,8 @@
 
 #include "ivug-parameter.h"
 #include "ivug-medialist.h"
-
 #include "ivug-slideshow.h"
 
-
 typedef struct {
        Evas_Object *parent;
 

diff --git a/inc/ivug-slideshow.h b/inc/ivug-slideshow.h
index 57b28a1..fff8f2e 100644 (file)
--- a/inc/ivug-slideshow.h
+++ b/inc/ivug-slideshow.h
@@ -16,16 +16,7 @@
 
 #pragma once
 
-// Slide Show
-
-/*
-       Start slide show.
-
-       if bSlideFirst == EINA_TRUE, slide and then wait interval time
-       if bSlideFirst == EINA_FALSE, wait interval time and then slide
-*/
 #include <Elementary.h>
-#include "ivug-define.h"
 #include "ivug-medialist.h"
 #include "ivug-config.h"
 
@@ -36,11 +27,6 @@ typedef enum {
        SLIDE_SHOW_PAUSE,
 } slideshow_state_t;
 
-/*
-Signals
-       "slideshow,finished" with slideshow_state_t
-*/
-
 typedef struct _SlideShow SlideShow;
 
 #ifdef __cplusplus

diff --git a/inc/ivug-string.h b/inc/ivug-string.h
index 5bbe149..8e3eb97 100644 (file)
--- a/inc/ivug-string.h
+++ b/inc/ivug-string.h
@@ -17,10 +17,8 @@
 #ifndef __IVUG_STRING_H__
 #define __IVUG_STRING_H__
 
-#include <libintl.h>
+#include <stdio.h>
 #include <app.h>
-#include "ivug-define.h"
-
 
 static inline char * ivug_get_resource_path()
 {

diff --git a/inc/ivug-uuid.h b/inc/ivug-uuid.h
index 628dd4c..0f04fec 100644 (file)
--- a/inc/ivug-uuid.h
+++ b/inc/ivug-uuid.h
@@ -20,13 +20,10 @@
 #include "ivug-datatypes.h"
 #include <stdbool.h>
 
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 UUID uuid_assign(UUID id);
 
 void uuid_free(UUID id);

diff --git a/src/common/debug.c b/src/common/debug.c
index 9c30528..f78290a 100644 (file)
--- a/src/common/debug.c
+++ b/src/common/debug.c
@@ -15,18 +15,13 @@
  */
 
 #include <stdio.h>
-#include <stdarg.h>
 #include <stdbool.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>              // localtime_r
-#include <sys/time.h>  // gettimeofday
-#include <unistd.h>
-#include <string.h>            // strrchr
+#include <time.h>
 #include <dlog.h>
 
-#undef ECORE_TIMER
+#include "debug.h"
 
+#undef ECORE_TIMER
 #undef PRINT_TID
 
 #ifndef __G_LIB_H__
@@ -38,8 +33,6 @@
 */
 #undef IV_FATURE_LOGGING_FATAL
 
-#include "debug.h"
-
 enum {
        _DEBUG_OUTPUT_DIRECTION_CONSOLE = (1 << 0),
        _DEBUG_OUTPUT_DIRECTION_SYSLOG = (1 << 1),
@@ -51,8 +44,6 @@ enum {
 // console message slower than dlog about 30~40 ms
 #define _DEBUG_OUTPUT_DIRECTION (_DEBUG_OUTPUT_DIRECTION_DLOG)
 
-#include <dlog.h>
-
 #ifndef INI_PATH
 #define INI_PATH "/var/log"
 #endif
@@ -287,5 +278,3 @@ void __custom_sec_debug_msg(debug_msg_type *debug_msg, const char *msg, ...)
 
 }
 
-
-

diff --git a/src/common/ivug-callback.c b/src/common/ivug-callback.c
index 9155fb1..73208dd 100644 (file)
--- a/src/common/ivug-callback.c
+++ b/src/common/ivug-callback.c
@@ -18,7 +18,6 @@
 #include "ivug-callback.h"
 
 #include <stdlib.h>
-//callback_func_t g_callback;
 
 callback_handle_t * ivug_callback_register()
 {
@@ -26,21 +25,6 @@ callback_handle_t * ivug_callback_register()
        return callback_handle;
 }
 
-void ivug_callback_set_callback(callback_handle_t *handle, callback_func_t callback, void *data)
-{
-       IV_ASSERT(handle != NULL);
-       handle->CBFunc = callback;
-       handle->data = data;
-}
-
-void ivug_callback_call(callback_handle_t *handle, void *data1, void *data2, void *data3)
-{
-       IV_ASSERT(handle != NULL);
-       if (handle->CBFunc) {
-               (handle->CBFunc)(data1, data2, data3, handle->data);
-       }
-}
-
 void ivug_callback_unregister(callback_handle_t *handle)
 {
        IV_ASSERT(handle != NULL);

diff --git a/src/common/ivug-config.c b/src/common/ivug-config.c
index e2613dd..b328136 100644 (file)
--- a/src/common/ivug-config.c
+++ b/src/common/ivug-config.c
@@ -14,13 +14,7 @@
  * limitations under the License.
  */
 
-#include "ivug-define.h"
-#include "ivug-datatypes.h"
-#include "ivug-uuid.h"
-
-#include <Elementary.h>
-#include <assert.h>
-#include <system_settings.h>
+#include <stdlib.h>
 #include <app_preference.h>
 
 #include "ivug-debug.h"

diff --git a/src/common/ivug-db.c b/src/common/ivug-db.c
index 7a28543..2f61b3a 100644 (file)
--- a/src/common/ivug-db.c
+++ b/src/common/ivug-db.c
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-#include "ivug-define.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <media_content.h>
 #include "ivug-debug.h"
 #include "ivug-util.h"
 #include "ivug-db.h"
 
-#include <Elementary.h>
-#include <media_content.h>
-
-#include <time.h>
-
 #define DB_QUERY_STORAGE_ALL "(MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)"
 #define LOG_LVL DBG_MSG_LVL_HIGH
 #define LOG_CAT "IV-DB"

diff --git a/src/common/ivug-dir.cpp b/src/common/ivug-dir.cpp
index 16bf23d..c17ad20 100644 (file)
--- a/src/common/ivug-dir.cpp
+++ b/src/common/ivug-dir.cpp
@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-#include "ivug-dir.h"
-
 #include <stdio.h>
 #include <dirent.h>
-#include <stdlib.h>
 
 #include "ivug-debug.h"
-#include <linux/limits.h>
+#include "ivug-dir.h"
 
 bool EnumFilesInDir(const char *dir, EnumFilesCB pFunc, void *data)
 {
@@ -51,27 +48,3 @@ bool EnumFilesInDir(const char *dir, EnumFilesCB pFunc, void *data)
        return true;
 }
 
-
-int GetFilesCountInDir(const char *dir)
-{
-       struct dirent ent_struct;
-       struct dirent *dptr;
-       DIR *dirp;
-
-       if ((dirp = opendir(dir)) == NULL) {
-               MSG_UTIL_ERROR("Cannot open dir : %s", dir);
-               return -1;
-       }
-
-       int nCount = 0;
-
-       while ((readdir_r(dirp, &ent_struct, &dptr) == 0) && dptr) {
-               if (dptr->d_type == DT_REG) {           // Only for gegular file
-                       nCount++;
-               }
-       }
-
-       closedir(dirp);
-
-       return nCount;
-}

diff --git a/src/common/ivug-exif.c b/src/common/ivug-exif.c
index 088172d..beb81db 100644 (file)
--- a/src/common/ivug-exif.c
+++ b/src/common/ivug-exif.c
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include <stdlib.h>
+#include <time.h>
 #include "ivug-debug.h"
 #include "ivug-exif.h"
 #include "ivug-file-util.h"
@@ -32,13 +34,6 @@
                } \
        } while (0)
 
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <time.h>
-#include <Elementary.h>
-
 #define IV_EXIF_BUF_LEN_MAX 65536L
 #define IV_EXIF_BUF_TIME_LEN_MAX 20
 #define IV_EXIF_DEFAULT_YEAR 1900

diff --git a/src/common/ivug-file-info.c b/src/common/ivug-file-info.c
index 22e8499..5ba336c 100644 (file)
--- a/src/common/ivug-file-info.c
+++ b/src/common/ivug-file-info.c
@@ -14,21 +14,14 @@
  * limitations under the License.
  */
 
-#include "ivug-define.h"
+#include <stdlib.h>
+#include <metadata_extractor.h>
+#include <mime_type.h>
 #include "ivug-file-info.h"
 #include "ivug-debug.h"
 #include "ivug-util.h"
 #include "ivug-file-util.h"
 
-#include <metadata_extractor.h>
-#include <string.h>
-#include <Evas.h>
-#include <Ecore_Evas.h>
-#include <Ecore_File.h>
-#include <Evas.h>
-
-#include <mime_type.h>
-
 #define BUF_LEN (255)
 
 static const char *_conver_error(int err)

diff --git a/src/common/ivug-file-util.c b/src/common/ivug-file-util.c
index 0fd9943..d87b469 100644 (file)
--- a/src/common/ivug-file-util.c
+++ b/src/common/ivug-file-util.c
@@ -62,7 +62,7 @@ int ivug_file_exists(const char *path)
        }
 }
 
-Eina_Bool ivug_is_dir(const char *path)
+int ivug_is_dir(const char *path)
 {
        struct stat info = {0,};
        if (!path) {

diff --git a/src/common/ivug-language-mgr.c b/src/common/ivug-language-mgr.c
index b9be80f..09de5d4 100644 (file)
--- a/src/common/ivug-language-mgr.c
+++ b/src/common/ivug-language-mgr.c
@@ -14,17 +14,9 @@
  * limitations under the License.
  */
 
-#include "ivug-define.h"
+#include <glib.h>
 #include "ivug-debug.h"
-#include "ivug-util.h"
-#include "ivug-db.h"
-
-#include <libintl.h>
-
 #include "ivug-language-mgr.h"
-#include <glib.h>
-
-#include <Elementary.h>
 
 #define LOG_LVL DBG_MSG_LVL_HIGH
 #define LOG_CAT "IV-LANGUAGE"

diff --git a/src/common/ivug-util.c b/src/common/ivug-util.c
index 6d1d6b9..1d2e255 100644 (file)
--- a/src/common/ivug-util.c
+++ b/src/common/ivug-util.c
@@ -14,35 +14,18 @@
  * limitations under the License.
  */
 
-
-#include "ivug-define.h"
-#include "ivug-uuid.h"
-
-#include "ivug-util.h"
-#include "ivug-file-util.h"
-#include "ivug-debug.h"
-#include "ivug-file-info.h"
-#include "ivug-db.h"
-
+#include <glib.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <glib.h>
-#include<limits.h>
-
 #include <system_settings.h>
 #include <storage/storage.h>
 #include <utils_i18n.h>
-
-#include <unicode/udat.h>
-#include <unicode/ustring.h>
-#include <unicode/uloc.h>
-#include <unicode/ucal.h>
-#include <unicode/udatpg.h>
-#include <unicode/utmscale.h>
+#include "ivug-define.h"
+#include "ivug-util.h"
+#include "ivug-file-util.h"
+#include "ivug-debug.h"
+#include "ivug-file-info.h"
 
 static int device_id = -1;
 static int mmc_id = -1;

diff --git a/src/common/ivug-uuid.c b/src/common/ivug-uuid.c
index d4b85aa..1e5c202 100644 (file)
--- a/src/common/ivug-uuid.c
+++ b/src/common/ivug-uuid.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/common/statistics.c b/src/common/statistics.c
index c7c83ed..d0efb93 100644 (file)
--- a/src/common/statistics.c
+++ b/src/common/statistics.c
@@ -14,28 +14,19 @@
  * limitations under the License.
  */
 
-#include <sys/time.h>  // gettimeofday
-
-#include <stdio.h>
+#include <sys/time.h>
 #include <malloc.h>
 #include <string.h>
 #include <assert.h>
 #include <time.h>
-#include "debug.h"
-
+#include <unistd.h>
+#include <stdarg.h>
+#include "statistics.h"
 
 #ifdef STANDALONE
 #define EXPORT_API
 #endif
 
-#include <sys/time.h>
-#include <sys/utsname.h>
-#include <sys/resource.h>
-#include <unistd.h>
-
-#include <stdarg.h>
-#include "statistics.h"
-
 #define MAX_UINT32 (0xFFFFFFFFL)
 #define MAX_UINT64 (0xFFFFFFFFFFFFFFFFLL)
 

diff --git a/src/main/control/ivug-crop-circular.cpp b/src/main/control/ivug-crop-circular.cpp
index aa0f158..09bda79 100644 (file)
--- a/src/main/control/ivug-crop-circular.cpp
+++ b/src/main/control/ivug-crop-circular.cpp
@@ -14,32 +14,27 @@
  * limitations under the License.
  */
 
+#include <image_util.h>
+#include <storage.h>
+#include <media_info.h>
+#include <media_content.h>
+#include <string>
 #include <Elementary.h>
-
 #include "ivug-crop-circular.h"
-#include "ivug-crop-view.h"
-
 #include "ivug-debug.h"
-#include "ivug-string.h"
 #include "ivug-context.h"
-#include "ivug-db.h"
 #include "ivug-exif.h"
-#include "ivug-language-mgr.h"
-#include "ivug-common.h"
 #include "ivug-file-info.h"
 
+#ifdef INSERT_TO_DB
+#include "ivug-db.h"
+#endif
+
 #undef LOG_LVL
 #define LOG_LVL DBG_MSG_LVL_MED
 
 #undef LOG_CAT
 #define LOG_CAT "IV-CROP-UG"
-
-
-#include <image_util.h>
-#include <storage.h>
-#include <media_info.h>
-#include <media_content.h>
-#include <string>
 #define SMALL_RECT_LEN (35)
 #define DRAG_TOLERANCE (400)
 

diff --git a/src/main/control/ivug-crop-ug.cpp b/src/main/control/ivug-crop-ug.cpp
index 37e1f6c..3602fe3 100644 (file)
--- a/src/main/control/ivug-crop-ug.cpp
+++ b/src/main/control/ivug-crop-ug.cpp
@@ -14,18 +14,16 @@
  * limitations under the License.
  */
 
+#include <image_util.h>
+#include <storage.h>
+#include <media_info.h>
+#include <media_content.h>
+#include <string>
 #include <Elementary.h>
-
 #include "ivug-crop-ug.h"
-#include "ivug-crop-view.h"
-
 #include "ivug-debug.h"
-#include "ivug-string.h"
 #include "ivug-context.h"
-#include "ivug-db.h"
 #include "ivug-exif.h"
-#include "ivug-language-mgr.h"
-#include "ivug-common.h"
 #include "ivug-file-info.h"
 
 #undef LOG_LVL
@@ -33,13 +31,6 @@
 
 #undef LOG_CAT
 #define LOG_CAT "IV-CROP-UG"
-
-
-#include <image_util.h>
-#include <storage.h>
-#include <media_info.h>
-#include <media_content.h>
-#include <string>
 #define SMALL_LEN (30)
 
 static media_packet_h packet_h;

diff --git a/src/main/control/ivug-ext-ug.c b/src/main/control/ivug-ext-ug.c
index c5c142e..90073aa 100644 (file)
--- a/src/main/control/ivug-ext-ug.c
+++ b/src/main/control/ivug-ext-ug.c
@@ -15,13 +15,10 @@
  */
 
 #include <app.h>
-#include <Elementary.h>
-
 #include "ivug-ext-ug.h"
-#include "ivug-util.h"
 #include "ivug-debug.h"
-#include "ivug-db.h"
-#include "ivug-context.h"
+#include "ivug-string.h"
+#include "ivug-language-mgr.h"
 
 void ivug_ext_app_control_reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *user_data)
 {

diff --git a/src/main/control/ivug-parameter.c b/src/main/control/ivug-parameter.c
index 81350cc..82ec09b 100644 (file)
--- a/src/main/control/ivug-parameter.c
+++ b/src/main/control/ivug-parameter.c
@@ -16,20 +16,11 @@
 
 #include <string.h>
 #include <system_settings.h>
-#include <limits.h>
-
-#include "ivug-common.h"
+#include <notification.h>
 #include "ivug-debug.h"
 #include "ivug-parameter.h"
-#include "ivug-file-info.h"
-#include "ivug-base.h"
 #include "ivug-main-view.h"
-#include "ivug-crop-ug.h"
-#include "ivug-context.h"
-#include <notification.h>
-
-#include "ivug-db.h"
-#include "ivug-util.h"
+#include "ivug-main-view-priv.h"
 
 //bundle key
 #define IVUG_BUNDLE_KEY_VIEW_MODE              "View Mode"

diff --git a/src/main/ivug-base.cpp b/src/main/ivug-base.cpp
index 3444557..4f0295d 100644 (file)
--- a/src/main/ivug-base.cpp
+++ b/src/main/ivug-base.cpp
@@ -14,17 +14,10 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <app.h>
 #include <storage.h>
 #include <efl_extension.h>
 
-#include "ivug-common.h"
-#include "ivug-util.h"
-#include "ivug-popup.h"
-#include "ivug-callback.h"
 #include "ivug-context.h"
-#include "ivug-language-mgr.h"
 #include "ivug-base.h"
 
 static Eina_Bool _on_exit_timer_expired(void *data)

diff --git a/src/main/popup/ivug-popup.c b/src/main/popup/ivug-popup.c
index 7a94e7d..93142f1 100644 (file)
--- a/src/main/popup/ivug-popup.c
+++ b/src/main/popup/ivug-popup.c
@@ -15,17 +15,10 @@
  */
 
 #include <efl_extension.h>
-
 #include "ivug-popup.h"
-#include "ivug-name-view.h"
-
-#include "ivug-language-mgr.h"
-#include "ivug-context.h"
 
 #define NOTIFY_TIMEOUT 3.0
-
 #define IVUG_POPUP_EDJ_NAME full_path(EDJ_PATH, "/ivug-popup.edj")
-
 #define TAG_BUDDY_ACCESS_FONT_SIZE 40
 #define TAG_BUDDY_ACCESS_FONT_COLOR "#FFFFFFFF"
 #define TAG_BUDDY_ACCESS_BUFFER 1024

diff --git a/src/main/slider/ivug-slider-new.cpp b/src/main/slider/ivug-slider-new.cpp
index 3e2f881..18b6677 100644 (file)
--- a/src/main/slider/ivug-slider-new.cpp
+++ b/src/main/slider/ivug-slider-new.cpp
@@ -15,23 +15,12 @@
  */
 
 #include <algorithm>
-
-#include <pthread.h>
-
+#include <notification.h>
 #include "ivug-common.h"
 #include "ivug-slider-new.h"
-
-#include "ivug-parameter.h"
-#include "ivug-define.h"
-#include "ivug-config.h"
-
-#include "ivug-util.h"
-
 #include "ivug-main-view.h"
 #include "ivug-main-view-priv.h"
 
-#include <notification.h>
-
 #define ICON_PLAY_SIZE 100
 #define LOGNTAP_THRESHOLD      (100)           // allow moving distance(pixel)
 #define TILT_THRESHOLD (3)             // allow tilt value

diff --git a/src/main/view/ivug-detail-view.c b/src/main/view/ivug-detail-view.c
index 85e3548..07d8751 100644 (file)
--- a/src/main/view/ivug-detail-view.c
+++ b/src/main/view/ivug-detail-view.c
@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <efl_extension.h>
 
+#include <efl_extension.h>
 #include "ivug-detail-view.h"
 #include "ivug-file-info.h"
-#include "ivug-file-util.h"
 #include "ivug-name-view.h"
-#include "ivug-util.h"
 #include "ivug-main-view-menu.h"
 
 #define FILE_SIZE_LEN_MAX                      64

diff --git a/src/main/view/ivug-main-view-menu.cpp b/src/main/view/ivug-main-view-menu.cpp
index 292bf5e..450fb91 100644 (file)
--- a/src/main/view/ivug-main-view-menu.cpp
+++ b/src/main/view/ivug-main-view-menu.cpp
@@ -14,42 +14,19 @@
  * limitations under the License.
  */
 
+#include <string>
+#include <storage/storage.h>
+#include <efl_extension.h>
+#include <app_manager.h>
+#include <notification.h>
 #include "ivug-common.h"
-#include "ivug-main-view.h"
-#include "ivug-main-view-toolbar.h"
 #include "ivug-main-view-menu.h"
 #include "ivug-main-view-priv.h"
-
-#include "ivug-ext-ug.h"
 #include "ivug-popup.h"
-
-#include "ivug-media.h"
 #include "ivug-slideshow.h"
-
 #include "ivug-file-info.h"
 #include "ivug-detail-view.h"
 
-#include <storage/storage.h>
-#include <shortcut_manager.h>
-#include <efl_extension.h>
-#include <app_manager.h>
-#include <efl_extension.h>
-#include <notification.h>
-#include <string>
-#include <glib.h>
-
-#include "ivug-db.h"
-#include "ivug-crop-view.h"
-#include "ivug-util.h"
-#include "ivug-config.h"
-#include "ivug-language-mgr.h"
-
-#define GALLERY_PKG_NAME       "com.samsung.gallery"
-#define SHORTCUT_PREFIX                "gallery:imageviewer:"
-#define SHORTCUT_PREFIX_LEN    strlen(SHORTCUT_PREFIX)
-#define ICON_NEAR_BY_PHONE             "icon.nearby.phone"
-#define ICON_NEAR_BY_UNKNOWN   "icon.nearby.unknown"
-
 static void
 ivug_notification_popup_create(Evas_Object * pParent, const char* text)
 {

diff --git a/src/main/view/ivug-main-view-toolbar.cpp b/src/main/view/ivug-main-view-toolbar.cpp
index c4e8b63..364dd27 100644 (file)
--- a/src/main/view/ivug-main-view-toolbar.cpp
+++ b/src/main/view/ivug-main-view-toolbar.cpp
@@ -15,10 +15,10 @@
  */
 
 #include "ivug-common.h"
-
-#include "ivug-main-view.h"
-#include "ivug-main-view-menu.h"
-#include "ivug-main-view-priv.h"
+#include "ivug-main-view-toolbar.h"
+//#include "ivug-main-view.h"
+//#include "ivug-main-view-menu.h"
+//#include "ivug-main-view-priv.h"
 
 #include <mime_type.h>
 

diff --git a/src/main/view/ivug-main-view.cpp b/src/main/view/ivug-main-view.cpp
index 8a4d0a0..69a54c4 100644 (file)
--- a/src/main/view/ivug-main-view.cpp
+++ b/src/main/view/ivug-main-view.cpp
@@ -18,25 +18,11 @@
 #include <media_content.h>
 #include <Ecore.h>
 #include <Ecore_IMF.h>
-
-#include "ivug-common.h"
-#include "ivug-parameter.h"
 #include "ivug-main-view.h"
 #include "ivug-main-view-toolbar.h"
 #include "ivug-main-view-menu.h"
 #include "ivug-photocam.h"
-#include "ivug-filter.h"
-#include "ivug-ext-ug.h"
-#include "ivug-db.h"
-#include "ivug-util.h"
-#include "ivug-media.h"
-#include "ivug-popup.h"
-#include "ivug-name-view.h"
-#include "ivug-slideshow.h"
 #include "ivug-ext-ug.h"
-#include "ivug-language-mgr.h"
-#include "ivug-file-info.h"
-#include "ivug-main-view-priv.h"
 #include "ivug-popup.h"
 #include "ivug-crop-ug.h"
 #include "ivug-crop-circular.h"

diff --git a/src/main/view/ivug-name-view.c b/src/main/view/ivug-name-view.c
index 5b1e7fd..3f35f42 100644 (file)
--- a/src/main/view/ivug-name-view.c
+++ b/src/main/view/ivug-name-view.c
@@ -16,13 +16,8 @@
 
 #include <efl_extension.h>
 #include <notification.h>
-
-#include "ivug-common.h"
 #include "ivug-name-view.h"
 #include "ivug-popup.h"
-#include "ivug-media.h"
-#include "ivug-util.h"
-#include "ivug-language-mgr.h"
 
 #undef LOG_LVL
 #define LOG_LVL DBG_MSG_LVL_HIGH

diff --git a/src/main/view/ivug-photocam.cpp b/src/main/view/ivug-photocam.cpp
index 52faa41..cfc851d 100644 (file)
--- a/src/main/view/ivug-photocam.cpp
+++ b/src/main/view/ivug-photocam.cpp
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-
 #include "ivug-main-view.h"
 #include "ivug-photocam.h"
 #include "ivug-main-view-priv.h"
-#include "ivug-main-view-toolbar.h"
 #include "ivug-file-info.h"
 
 #define ABS(x) ((x) < 0 ? -(x) : (x))

diff --git a/src/main/view/ivug-slideshow-view.cpp b/src/main/view/ivug-slideshow-view.cpp
index b3cefe4..ef0c2c8 100644 (file)
--- a/src/main/view/ivug-slideshow-view.cpp
+++ b/src/main/view/ivug-slideshow-view.cpp
@@ -14,21 +14,11 @@
  * limitations under the License.
  */
 
+#include <device/power.h>
 #include "ivug-common.h"
-#include "ivug-parameter.h"
-
 #include "ivug-slideshow-view.h"
 #include "ivug-main-view.h"
 
-#include <device/power.h>
-
-#include "ivug-filter.h"
-
-#include "ivug-popup.h"
-
-#include "ivug-language-mgr.h"
-
-
 #undef LOG_LVL
 #define LOG_LVL DBG_MSG_LVL_MED
 

diff --git a/src/medialist/ivug-data-list.c b/src/medialist/ivug-data-list.c
index bdbc3f6..94d2ed4 100644 (file)
--- a/src/medialist/ivug-data-list.c
+++ b/src/medialist/ivug-data-list.c
@@ -14,20 +14,15 @@
  * limitations under the License.
  */
 
-#include "ivug-define.h"
+#include <Eina.h>
+#include <media_content.h>
 #include "ivug-data-list.h"
-#include "ivug-uuid.h"
 #include "ivug-debug.h"
-#include "ivug-media.h"
 #include "ivug-mediadata.h"
 #include "ivug-file-info.h"
 #include "ivug-db.h"
 #include "ivug-dir.h"
 #include "ivug-util.h"
-#include "ivug-filter.h"
-
-#include <Eina.h>
-#include <media_content.h>
 
 static char *_strerror_db(int error)
 {

diff --git a/src/medialist/ivug-filter.c b/src/medialist/ivug-filter.c
index 47140c6..62ab9e5 100644 (file)
--- a/src/medialist/ivug-filter.c
+++ b/src/medialist/ivug-filter.c
@@ -16,12 +16,8 @@
 
 #include "ivug-datatypes.h"
 #include "ivug-filter.h"
-
-#include <Eina.h>
-
 #include "ivug-debug.h"
 #include "ivug-uuid.h"
-#include "ivug-util.h"
 
 void ivug_data_filter_delete(Filter_struct *filter_str)
 {

diff --git a/src/medialist/ivug-mediadata.c b/src/medialist/ivug-mediadata.c
index af198c2..8f08888 100644 (file)
--- a/src/medialist/ivug-mediadata.c
+++ b/src/medialist/ivug-mediadata.c
@@ -14,19 +14,14 @@
  * limitations under the License.
  */
 
-#include "ivug-define.h"
-#include "ivug-datatypes.h"
+#include <aul.h>
+#include <app.h>
 #include "ivug-uuid.h"
 #include "ivug-debug.h"
-#include "ivug-medialist.h"
 #include "ivug-mediadata.h"
 #include "ivug-util.h"
 #include "ivug-file-info.h"
-
-#include "ivug-db.h"
 #include <media_content.h>
-#include <aul.h>
-#include <app.h>
 
 static inline char * ivug_get_resource_path()
 {

diff --git a/src/medialist/ivug-medialist.cpp b/src/medialist/ivug-medialist.cpp
index 08dbb21..9746014 100644 (file)
--- a/src/medialist/ivug-medialist.cpp
+++ b/src/medialist/ivug-medialist.cpp
@@ -14,23 +14,15 @@
  * limitations under the License.
  */
 
-#include "ivug-define.h"
-
+#include <Ecore.h>
+#include <pthread.h>
+#include <algorithm>
 #include "ivug-debug.h"
 #include "ivug-medialist.h"
-
 #include "ivug-mediadata.h"
-
 #include "ivug-data-list.h"
-
-
 #include "ivug-db.h"
 
-#include <Ecore.h>
-#include <pthread.h>
-#include <algorithm>
-
-
 #undef DEBUG_DUMP_LIST
 
 #define LOAD_BLOCK_COUNT (100)

diff --git a/src/slideshow/control/ivug-slideshow.cpp b/src/slideshow/control/ivug-slideshow.cpp
index 233c262..a80702b 100644 (file)
--- a/src/slideshow/control/ivug-slideshow.cpp
+++ b/src/slideshow/control/ivug-slideshow.cpp
@@ -14,28 +14,14 @@
  * limitations under the License.
  */
 
-#include <stdlib.h>
-
+#include <device/power.h>
+#include <assert.h>
 #include <efl_extension.h>
-
 #include "ivug-string.h"
-#include "ivug-anim.h"
 #include "ivug-slideshow.h"
 #include "ivug-slideshow-priv.h"
-
 #include "ivug-debug.h"
 
-#include "ivug-config.h"
-#include "ivug-define.h"
-#include "ivug-datatypes.h"
-#include "ivug-uuid.h"
-#include "ivug-util.h"
-#include "ivug-context.h"
-
-#include <Elementary.h>
-#include <device/power.h>
-#include <assert.h>
-
 #define DEFAULT_THUMBNAIL              "/opt/usr/share/media/.thumb/thumb_default.png"
 
 #undef LOG_LVL

diff --git a/src/slideshow/effect/ivug-anim.c b/src/slideshow/effect/ivug-anim.c
index 1cc416e..fe4c034 100644 (file)
--- a/src/slideshow/effect/ivug-anim.c
+++ b/src/slideshow/effect/ivug-anim.c
@@ -16,7 +16,6 @@
 
 
 #include <stddef.h>            /* for NULL */
-#include <memory.h>
 #include <stdlib.h>
 
 #include "ivug-debug.h"

diff --git a/src/ug-image-viewer.cpp b/src/ug-image-viewer.cpp
index 81559aa..7a4b6b9 100644 (file)
--- a/src/ug-image-viewer.cpp
+++ b/src/ug-image-viewer.cpp
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include <app.h>
 
 #include "ivug-debug.h"
-#include "ivug-define.h"
 #include "ivug-base.h"
 
 #define _CONSTRUCTOR __attribute__ ((constructor))