[cleanup]revise file names 76/238776/1
authorYoungjae Shin <yj99.shin@samsung.com>
Fri, 17 Jul 2020 07:53:01 +0000 (16:53 +0900)
committerYoungjae Shin <yj99.shin@samsung.com>
Fri, 17 Jul 2020 07:54:02 +0000 (16:54 +0900)
Change-Id: Ief917410b5cd4da71c679795089cf9c678a227e3

46 files changed:
.gbs.conf [deleted file]
CMakeLists.txt [changed mode: 0755->0644]
LICENSE.Flora [changed mode: 0755->0644]
build_mobile.sh [deleted file]
db-service/CMakeLists.txt [moved from download_db_service/CMakeLists.txt with 86% similarity, mode: 0644]
db-service/download-db-svc-common.h [moved from download_db_service/include/download-db-service-common.h with 99% similarity, mode: 0644]
db-service/download-db-svc-debug.h [moved from download_db_service/include/download-db-service-debug.h with 98% similarity, mode: 0644]
db-service/download-db-svc-main.cpp [moved from download_db_service/download-db-service-main.cpp with 97% similarity, mode: 0644]
db-service/download-db-svc-main.h [moved from download_db_service/include/download-db-service-main.h with 98% similarity, mode: 0644]
db-service/download-db-svc.cpp [moved from download_db_service/download-db-service.cpp with 92% similarity, mode: 0644]
db-service/download-db-svc.h [new file with mode: 0644]
download_db_service/include/download-db-service.h [deleted file]
oma-parser/CMakeLists.txt [changed mode: 0755->0644]
oma-parser/oma-parser-common.c [changed mode: 0755->0644]
oma-parser/oma-parser-common.h [changed mode: 0755->0644]
oma-parser/oma-parser-dd1.h [changed mode: 0755->0644]
oma-parser/oma-parser-interface.h [changed mode: 0755->0644]
packaging/org.tizen.download-manager.spec [changed mode: 0755->0644]
res/org.tizen.download-manager.xml [changed mode: 0755->0644]
src/download-mgr-common.h [moved from src/include/download-manager-common.h with 99% similarity, mode: 0644]
src/download-mgr-dateTime.cpp [moved from src/download-manager-dateTime.cpp with 99% similarity, mode: 0644]
src/download-mgr-dateTime.h [moved from src/include/download-manager-dateTime.h with 97% similarity, mode: 0644]
src/download-mgr-debug.h [moved from src/include/download-manager-debug.h with 100% similarity, mode: 0644]
src/download-mgr-downloadItem.cpp [moved from src/download-manager-downloadItem.cpp with 99% similarity, mode: 0644]
src/download-mgr-downloadItem.h [moved from src/include/download-manager-downloadItem.h with 98% similarity, mode: 0644]
src/download-mgr-downloadRequest.cpp [moved from src/download-manager-downloadRequest.cpp with 98% similarity, mode: 0644]
src/download-mgr-downloadRequest.h [moved from src/include/download-manager-downloadRequest.h with 100% similarity, mode: 0644]
src/download-mgr-event.cpp [moved from src/download-manager-event.cpp with 95% similarity, mode: 0644]
src/download-mgr-event.h [moved from src/include/download-manager-event.h with 100% similarity, mode: 0644]
src/download-mgr-history-db.cpp [moved from src/download-manager-history-db.cpp with 99% similarity, mode: 0644]
src/download-mgr-history-db.h [moved from src/include/download-manager-history-db.h with 98% similarity, mode: 0644]
src/download-mgr-item.cpp [moved from src/download-manager-item.cpp with 98% similarity, mode: 0644]
src/download-mgr-item.h [moved from src/include/download-manager-item.h with 98% similarity, mode: 0644]
src/download-mgr-items.cpp [moved from src/download-manager-items.cpp with 97% similarity, mode: 0644]
src/download-mgr-items.h [moved from src/include/download-manager-items.h with 96% similarity, mode: 0644]
src/download-mgr-main.cpp [moved from src/main.cpp with 97% similarity, mode: 0644]
src/download-mgr-network.cpp [moved from src/download-manager-network.cpp with 94% similarity, mode: 0644]
src/download-mgr-network.h [moved from src/include/download-manager-network.h with 95% similarity, mode: 0644]
src/download-mgr-notification.cpp [moved from src/download-manager-notification.cpp with 99% similarity, mode: 0644]
src/download-mgr-notification.h [moved from src/include/download-manager-notification.h with 93% similarity, mode: 0644]
src/download-mgr-util.cpp [moved from src/download-manager-util.cpp with 99% similarity, mode: 0644]
src/download-mgr-util.h [moved from src/include/download-manager-util.h with 98% similarity, mode: 0644]
src/download-mgr-view.cpp [moved from src/download-manager-view.cpp with 99% similarity, mode: 0644]
src/download-mgr-view.h [moved from src/include/download-manager-view.h with 98% similarity, mode: 0644]
src/download-mgr-viewItem.cpp [moved from src/download-manager-viewItem.cpp with 99% similarity, mode: 0644]
src/download-mgr-viewItem.h [moved from src/include/download-manager-viewItem.h with 98% similarity, mode: 0644]

diff --git a/.gbs.conf b/.gbs.conf
deleted file mode 100755 (executable)
index 54368f8..0000000
--- a/.gbs.conf
+++ /dev/null
@@ -1,264 +0,0 @@
-###############################################
-#    For TV                                                                                                            #
-###############################################
-
-###############################################
-#
-# Tizen v3.0 for TV (arm-x11)
-#
-
-[obs.tizen_v3.0]
-url = https://api.tizen.org
-
-[profile.tztv_v3.0]
-obs = obs.tizen_v3.0
-repos = repo.tv_arm-x11
-buildroot = ~/GBS-ROOT-3.0-TV
-
-[repo.tv_arm-x11]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm-x11/packages/
-
-###############################################
-#
-# Tizen v3.0 for tv (emulator32-x11)
-#
-
-[profile.tztv_v3.0_emulator]
-obs = obs.tizen_v3.0
-repos = repo.tztv_v3.0_emul
-buildroot = ~/GBS-ROOT-3.0-TV-EMUL
-
-[repo.tztv_v3.0_emul]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/emulator32-x11/packages/
-
-###############################################
-#
-# Tizen v3.0 for tv (arm64-x11)
-#
-
-[profile.tztv_v3.0_arm64-x11]
-obs = obs.tizen_v3.0
-repos = repo.tztv_v3.0_arm64-x11
-buildroot = ~/GBS-ROOT-3.0-TV-arm64-x11
-
-[repo.tztv_v3.0_arm64-x11]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm64-x11/packages/
-
-###############################################
-#
-# Tizen v3.0 for tv (ia32-x11)
-#
-
-[profile.tztv_v3.0_ia32-x11]
-obs = obs.tizen_v3.0
-repos = repo.tztv_v3.0_ia32-x11
-buildroot = ~/GBS-ROOT-3.0-TV-ia32-x11
-
-[repo.tztv_v3.0_ia32-x11]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/ia32-x11/packages/
-
-###############################################
-#
-# Tizen v3.0 for tv (ia32-wayland)
-#
-
-[profile.tztv_v3.0_ia32-wayland]
-obs = obs.tizen_v3.0
-repos = repo.tztv_v3.0_ia32-wayland
-buildroot = ~/GBS-ROOT-3.0-TV-ia32-wayland
-
-[repo.tztv_v3.0_ia32-wayland]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/ia32-wayland/packages/
-
-###############################################
-#
-# Tizen v3.0 for tv (x86_64-x11)
-#
-
-[profile.tztv_v3.0_x86_64-x11]
-obs = obs.tizen_v3.0
-repos = repo.tztv_v3.0_x86_64-x11
-buildroot = ~/GBS-ROOT-3.0-TV-x86_64-x11
-
-[repo.tztv_v3.0_x86_64-x11]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/x86_64-x11/packages/
-
-
-###############################################
-#
-# Tizen v3.0 for tv (x86_64-wayland)
-#
-
-[profile.tztv_v3.0_x86_64-wayland]
-obs = obs.tizen_v3.0
-repos = repo.tztv_v3.0_x86_64-wayland
-buildroot = ~/GBS-ROOT-3.0-TV-x86_64-wayland
-
-[repo.tztv_v3.0_x86_64-wayland]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/x86_64-wayland/packages/
-
-###############################################
-#
-# Tizen v3.0 for tv (HawkP)
-#
-
-[obs.spin]
-url = http://168.219.209.58:81
-
-[profile.tztv_v3.0_arm-wayland_h]
-obs = obs.spin
-repos = repo.spin_3.0_base_arm,repo.spin_3.0_tv_hawkp
-
-[repo.spin_3.0_base_arm]
-url = http://10.113.136.32/download/snapshots/tizen/base/latest/repos/arm/packages/
-user = blinkbot
-passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
-
-
-[repo.spin_3.0_tv_hawkp]
-url = http://10.113.136.32/download/snapshots/tizen/3.0-tv/latest/repos/target/packages/
-user = blinkbot
-passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
-
-
-
-###############################################
-#
-# Tizen v3.0 for TV (arm-wayland)
-#
-
-[profile.tztv_v3.0-wayland]
-obs = obs.tizen_v3.0
-repos = repo.public_3.0_base_arm,repo.tv_arm-wayland
-buildroot = ~/GBS-ROOT-3.0-TV-wayland
-
-[repo.public_3.0_base_arm]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/arm/packages/
-
-[repo.tv_arm-wayland]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm-wayland/packages/
-
-###############################################
-#
-# Tizen v3.0 for tv (arm-wayland), Mirroring Server for HQ developers
-#
-[profile.tztv_v3.0-wayland_mirror]
-obs = obs.tizen_v3.0
-repos = repo.public_3.0_base_arm_mirror, repo.tztv_v3.0-wayland_mirror
-buildroot = ~/GBS-ROOT-3.0-TV-wayland
-
-[repo.public_3.0_base_arm_mirror]
-url = http://10.113.63.117/snapshots/base/latest/repos/arm/packages/
-
-[repo.tztv_v3.0-wayland_mirror]
-url = http://10.113.63.117/snapshots/tv/latest/repos/arm-wayland/packages/
-
-###############################################
-#
-# Tizen v3.0 for tv (emulator32-wayland)
-#
-
-[profile.tztv_v3.0_emulator-wayland]
-obs = obs.tizen_v3.0
-repos = repo.public_3.0_base_emulator32,repo.tztv_v3.0_emul-wayland
-buildroot = ~/GBS-ROOT-3.0-TV-EMUL-wayland
-
-[repo.public_3.0_base_emulator32]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/emulator32/packages/
-
-[repo.tztv_v3.0_emul-wayland]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/emulator32-wayland/packages/
-
-###############################################
-#
-# Tizen v3.0 for tv (arm64-wayland)
-#
-
-[profile.tztv_v3.0_arm64-wayland]
-obs =obs.tizen_v3.0
-repos = repo.tztv_v3.0_arm64-wayland
-buildroot = ~/GBS-ROOT-3.0-TV-arm64-wayland
-
-[repo.tztv_v3.0_arm64-wayland]
-url = http://download.tizen.org/snapshots/tizen/tv/latest/repos/arm64-wayland/packages/
-
-###############################################
-#    For Mobile                                                                                                     #
-###############################################
-
-###############################################
-#
-# Tizen v3.0 for mobile (arm-wayland)
-#
-[obs.tizen_v3.0]
-url = https://api.tizen.org
-
-[profile.tzmo_v3.0_arm-wayland]
-obs = obs.tizen_v3.0
-repos = repo.public_3.0_base_arm,repo.tzmo_v3.0_arm-wayland
-buildroot = ~/GBS-ROOT-3.0-MOBILE-arm-wayland
-
-[repo.public_3.0_base_arm]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/arm/packages/
-
-[repo.tzmo_v3.0_arm-wayland]
-url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm-wayland/packages/
-
-
-###############################################
-#
-# Tizen v3.0 for mobile (arm-wayland), Mirroring Server for HQ developers
-#
-
-[profile.tzmo_v3.0_arm-wayland_mirror]
-obs = obs.tizen_v3.0
-repos = repo.public_3.0_base_arm_mirror, repo.tzm0_v3.0_arm-wayland_mirror
-buildroot = ~/GBS-ROOT-3.0-MOBILE-arm-wayland
-user = min7.choi
-passwdx = QlpoOTFBWSZTWcZ0gRoAAAIJgHQAIBQcACAAIgaGmEAMKNjFx9MXckU4UJDGdIEa
-
-[repo.public_3.0_base_arm_mirror]
-#url = http://10.113.63.117/snapshots/base/latest/repos/arm/packages/
-url = http://165.213.149.200/download/public_mirror/tizen/base/latest/repos/arm/packages/
-
-[repo.tzm0_v3.0_arm-wayland_mirror]
-#url = http://10.113.63.117/snapshots/mobile/latest/repos/target-TM1/packages/
-url = http://165.213.149.200/download/public_mirror/tizen/mobile/latest/repos/target-TM1/packages/
-
-
-
-###############################################
-#
-# Tizen v3.0 for mobile (emulator-wayland)
-#
-[profile.tzmo_v3.0_emulator-wayland]
-obs = obs.tizen_v3.0
-repos = repo.public_3.0_base_emulator32, repo.tzmo_v3.0_emul-wayland
-buildroot = ~/GBS-ROOT-3.0-MOBILE-EMUL-WAYLAND
-
-[repo.public_3.0_base_emulator32]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/emulator32/packages/
-
-[repo.tzmo_v3.0_emul-wayland]
-url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/emulator32-wayland/packages/
-
-
-###############################################
-#
-# Tizen v3.0 for mobile (arm64-wayland)
-#
-[obs.tizen_v3.0]
-url = https://api.tizen.org
-
-[profile.tzmo_v3.0_arm64-wayland]
-obs = obs.tizen_v3.0
-repos = repo.public_3.0_base_arm64,repo.tzmo_v3.0_arm64-wayland
-buildroot = ~/GBS-ROOT-3.0-MOBILE-arm64-wayland
-
-[repo.public_3.0_base_arm64]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/arm64/packages/
-
-[repo.tzmo_v3.0_arm64-wayland]
-url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm64-wayland/packages/
-
-
old mode 100755 (executable)
new mode 100644 (file)
index eb1457e..32b4917
@@ -32,22 +32,7 @@ EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
 
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src/include" "${CMAKE_SOURCE_DIR}/oma-parser/")
 
-SET(SRCS
-       src/main.cpp
-       src/download-manager-event.cpp
-       src/download-manager-network.cpp
-       src/download-manager-view.cpp
-       src/download-manager-viewItem.cpp
-       src/download-manager-items.cpp
-       src/download-manager-item.cpp
-       src/download-manager-downloadItem.cpp
-       src/download-manager-downloadRequest.cpp
-       src/download-manager-notification.cpp
-       src/download-manager-util.cpp
-       src/download-manager-history-db.cpp
-       src/download-manager-dateTime.cpp
-       src/download-manager-network.cpp
-)
+FILE(GLOB SRCS src/*.cpp)
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
        SET(CMAKE_BUILD_TYPE "Release")
@@ -162,7 +147,7 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/res/org.tizen.download-manager.png DESTINATION
 INSTALL(TARGETS ${PROJ_NAME} DESTINATION ${BINDIR})
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.Flora share/license/${PKGNAME})
 
-ADD_SUBDIRECTORY(download_db_service)
+ADD_SUBDIRECTORY(db-service)
 
 # i18n
 IF(TIZEN_2_3_UX)
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/build_mobile.sh b/build_mobile.sh
deleted file mode 100755 (executable)
index bdf9a17..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#gbs -c .gbs.conf build -P profile.tzmo_v3.0_arm-wayland -A armv7l --include-all
-gbs -c .gbs.conf build -P profile.tzmo_v3.0_arm-wayland_mirror -A armv7l --include-all
old mode 100755 (executable)
new mode 100644 (file)
similarity index 86%
rename from download_db_service/CMakeLists.txt
rename to db-service/CMakeLists.txt
index 8de5ee1..f15b83f
@@ -13,14 +13,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
 
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -O2 -g -Wall")
 
-SET(DOWNLOAD-DB-SERVICE-SRCS
-        ${CMAKE_CURRENT_SOURCE_DIR}/download-db-service.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/download-db-service-main.cpp
-)
-
-INCLUDE_DIRECTORIES(
-               ${CMAKE_CURRENT_SOURCE_DIR}/include/
-)
+FILE(GLOB DOWNLOAD-DB-SERVICE-SRCS *.cpp)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(download_db_pkgs REQUIRED glib-2.0 dlog capi-appfw-application capi-appfw-service-application data-control dlog sqlite3)
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from download_db_service/include/download-db-service-common.h
rename to db-service/download-db-svc-common.h
index 79b7658..0686fe3
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #ifndef DOWNLOAD_DB_SERVICE_COMMON_H
 #define DOWNLOAD_DB_SERVICE_COMMON_H
 
 #include <libintl.h>
-#include "download-db-service-debug.h"
+#include "download-db-svc-debug.h"
 #include <tzplatform_config.h>
 
 #define _EDJ(o) elm_layout_edje_get(o)
@@ -148,4 +147,3 @@ enum TYPE {
 }
 
 #endif /* DOWNLOAD_DB_SERVICE_COMMON_H */
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from download_db_service/include/download-db-service-debug.h
rename to db-service/download-db-svc-debug.h
index df6b90f..81722a6
@@ -1,5 +1,3 @@
-
-/* DOWNLOAD_MANAGER_DEBUG_H */
 /*
  * Copyright 2012  Samsung Electronics Co., Ltd
  *
@@ -15,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #ifndef DOWNLOAD_DB_SERVICE_DEBUG_H
 #define DOWNLOAD_DB_SERVICE_DEBUG_H
 
@@ -61,4 +58,3 @@
 #endif /*_USE_DLOG*/
 
 #endif /* DOWNLOAD_DB_SERVICE_DEBUG_H */
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from download_db_service/download-db-service-main.cpp
rename to db-service/download-db-svc-main.cpp
index 86b697c..2efe1d9
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include <list>
 #include <string>
 #include <iostream>
 #include <glib.h>
 
 #include <sstream>
-//#include "download-manager-common.h"
-//#include "download-manager-history-db.h"
-#include "download-db-service-main.h"
-#include "download-db-service-debug.h"
+//#include "download-mgr-common.h"
+//#include "download-mgr-history-db.h"
+#include "download-db-svc-main.h"
+#include "download-db-svc-debug.h"
 
 
 #define FINALIZE_ON_ERROR(stmt) { \
@@ -233,4 +232,3 @@ void DownloadHistoryDB::update_request_cb(int request_id, data_control_h provide
 
        free(command);
 }
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from download_db_service/include/download-db-service-main.h
rename to db-service/download-db-svc-main.h
index 1bbceb9..f97767e
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #ifndef DOWNLOAD_DB_SERVICE_MAIN_H
 #define DOWNLOAD_DB_SERVICE_MAIN_H
 
 #include <string>
 #include <queue>
 #include <sqlite3.h>
-//#include "download-manager-item.h"
+//#include "download-mgr-item.h"
 #include "data_control.h"
 #include <libintl.h>
 
@@ -71,5 +70,3 @@ private:
 };
 
 #endif /* DOWNLOAD_DB_SERVICE_MAIN_H */
-
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 92%
rename from download_db_service/download-db-service.cpp
rename to db-service/download-db-svc.cpp
index e267222..cc26b69
-/*\r
- * Copyright 2012  Samsung Electronics Co., Ltd\r
- *\r
- * Licensed under the Flora License, Version 1.1 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *    http://floralicense.org/license/\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#include <list>\r
-#include <string>\r
-#include <iostream>\r
-#include <memory>\r
-\r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include <glib.h>\r
-\r
-extern "C"\r
-{\r
-#include <tizen.h>\r
-#include <service_app.h>\r
-#include <app_event.h>\r
-}\r
-\r
-#include "download-db-service.h"\r
-#include "download-db-service-main.h"\r
-#include "download-db-service-debug.h"\r
-\r
-\r
-\r
-data_control_provider_sql_cb *sql_callback;\r
-\r
-void insert_request_cb(int request_id, data_control_h provider, bundle *insert_data, void *user_data)\r
-{\r
-       DownloadHistoryDB::insert_request_cb(request_id, provider, insert_data);\r
-}\r
-\r
-void delete_request_cb(int request_id, data_control_h provider, const char *where, void *user_data)\r
-{\r
-       DownloadHistoryDB::delete_request_cb(request_id, provider, where);\r
-}\r
-\r
-void select_request_cb(int request_id, data_control_h provider, const char **column_list, int column_count, const char *where, const char *order, void *user_data)\r
-{\r
-       DownloadHistoryDB::select_request_cb(request_id, provider, column_list, column_count, where, order);\r
-}\r
-\r
-void update_request_cb(int request_id, data_control_h provider, bundle *update_data, const char *where, void *user_data)\r
-{\r
-       DownloadHistoryDB::update_request_cb(request_id, provider, update_data, where);\r
-}\r
-\r
-\r
-void initialize_datacontrol_provider()\r
-{\r
-       DM_LOGI("initialize_datacontrol_provider");\r
-\r
-       int result;\r
-\r
-       sql_callback = (data_control_provider_sql_cb *)malloc(sizeof(data_control_provider_sql_cb));\r
-       if (sql_callback) {\r
-               sql_callback->select_cb = select_request_cb;\r
-               sql_callback->insert_cb = insert_request_cb;\r
-               sql_callback->delete_cb = delete_request_cb;\r
-               sql_callback->update_cb = update_request_cb;\r
-               result = data_control_provider_sql_register_cb(sql_callback, NULL);\r
-       } else {\r
-               result = DATA_CONTROL_ERROR_OUT_OF_MEMORY;\r
-       }\r
-       if (result != DATA_CONTROL_ERROR_NONE)\r
-               DM_LOGE("initialize_datacontrol_provider failed with error: %d", result);\r
-       else\r
-               DM_LOGI("Provider SQL register success");\r
-}\r
-\r
-#if 0\r
-/* End : Support to enable fingerprint lock */\r
-HAPI int main(int argc, char *argv[])\r
-{\r
-       int r = 0;\r
-       download_db_service_appdata ad;\r
-       app_event_handler_h handlers[5] = {NULL, };\r
-\r
-       initialize_datacontrol_provider();\r
-\r
-       ui_app_lifecycle_callback_s ops = {\r
-               .create = _app_create,\r
-               .terminate = _app_terminate,\r
-               .pause = _app_pause,\r
-               .resume = _app_resume,\r
-               .app_control = _app_control,\r
-       };\r
-\r
-       ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, _app_lang_changed, &ad);\r
-\r
-       memset(&ad, 0x00, sizeof(download_db_service_appdata));\r
-\r
-       r = ui_app_main(argc, argv, &ops, &ad);\r
-\r
-       if (r == -1) {\r
-               return -1;\r
-       }\r
-\r
-       return 0;\r
-}\r
-\r
-#endif\r
-bool service_app_create(void *data)\r
-{\r
-       DM_LOGI("app_create");\r
-\r
-\r
-       return true;\r
-}\r
-\r
-void service_app_terminate(void *data)\r
-{\r
-       DM_LOGI("app_terminate");\r
-\r
-\r
-       return;\r
-}\r
-\r
-void service_app_control(app_control_h app_control, void *data)\r
-{\r
-       DM_LOGI("service_app_control called");\r
-\r
-#if 0\r
-       int ret = 0;\r
-       char *operation = NULL;\r
-       char *cmd = NULL;\r
-\r
-       ret = app_control_get_operation(app_control, &operation);\r
-#endif\r
-       return;\r
-}\r
-\r
-int main(int argc, char* argv[])\r
-{\r
-       service_app_lifecycle_callback_s event_callback = {0, };\r
-\r
-       initialize_datacontrol_provider();\r
-\r
-       event_callback.create = service_app_create;\r
-       event_callback.terminate = service_app_terminate;\r
-       event_callback.app_control = service_app_control;\r
-\r
-       return service_app_main(argc, argv, &event_callback, NULL);\r
-}\r
-\r
-\r
-/* End of file */\r
-\r
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ *
+ * 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
+ *
+ *    http://floralicense.org/license/
+ *
+ * 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.
+ */
+#include <list>
+#include <string>
+#include <iostream>
+#include <memory>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <glib.h>
+
+extern "C"
+{
+#include <tizen.h>
+#include <service_app.h>
+#include <app_event.h>
+}
+
+#include "download-db-svc.h"
+#include "download-db-svc-main.h"
+#include "download-db-svc-debug.h"
+
+
+
+data_control_provider_sql_cb *sql_callback;
+
+void insert_request_cb(int request_id, data_control_h provider, bundle *insert_data, void *user_data)
+{
+       DownloadHistoryDB::insert_request_cb(request_id, provider, insert_data);
+}
+
+void delete_request_cb(int request_id, data_control_h provider, const char *where, void *user_data)
+{
+       DownloadHistoryDB::delete_request_cb(request_id, provider, where);
+}
+
+void select_request_cb(int request_id, data_control_h provider, const char **column_list, int column_count, const char *where, const char *order, void *user_data)
+{
+       DownloadHistoryDB::select_request_cb(request_id, provider, column_list, column_count, where, order);
+}
+
+void update_request_cb(int request_id, data_control_h provider, bundle *update_data, const char *where, void *user_data)
+{
+       DownloadHistoryDB::update_request_cb(request_id, provider, update_data, where);
+}
+
+
+void initialize_datacontrol_provider()
+{
+       DM_LOGI("initialize_datacontrol_provider");
+
+       int result;
+
+       sql_callback = (data_control_provider_sql_cb *)malloc(sizeof(data_control_provider_sql_cb));
+       if (sql_callback) {
+               sql_callback->select_cb = select_request_cb;
+               sql_callback->insert_cb = insert_request_cb;
+               sql_callback->delete_cb = delete_request_cb;
+               sql_callback->update_cb = update_request_cb;
+               result = data_control_provider_sql_register_cb(sql_callback, NULL);
+       } else {
+               result = DATA_CONTROL_ERROR_OUT_OF_MEMORY;
+       }
+       if (result != DATA_CONTROL_ERROR_NONE)
+               DM_LOGE("initialize_datacontrol_provider failed with error: %d", result);
+       else
+               DM_LOGI("Provider SQL register success");
+}
+
+#if 0
+/* End : Support to enable fingerprint lock */
+HAPI int main(int argc, char *argv[])
+{
+       int r = 0;
+       download_db_service_appdata ad;
+       app_event_handler_h handlers[5] = {NULL, };
+
+       initialize_datacontrol_provider();
+
+       ui_app_lifecycle_callback_s ops = {
+               .create = _app_create,
+               .terminate = _app_terminate,
+               .pause = _app_pause,
+               .resume = _app_resume,
+               .app_control = _app_control,
+       };
+
+       ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, _app_lang_changed, &ad);
+
+       memset(&ad, 0x00, sizeof(download_db_service_appdata));
+
+       r = ui_app_main(argc, argv, &ops, &ad);
+
+       if (r == -1) {
+               return -1;
+       }
+
+       return 0;
+}
+
+#endif
+bool service_app_create(void *data)
+{
+       DM_LOGI("app_create");
+
+
+       return true;
+}
+
+void service_app_terminate(void *data)
+{
+       DM_LOGI("app_terminate");
+
+
+       return;
+}
+
+void service_app_control(app_control_h app_control, void *data)
+{
+       DM_LOGI("service_app_control called");
+
+#if 0
+       int ret = 0;
+       char *operation = NULL;
+       char *cmd = NULL;
+
+       ret = app_control_get_operation(app_control, &operation);
+#endif
+       return;
+}
+
+int main(int argc, char* argv[])
+{
+       service_app_lifecycle_callback_s event_callback = {0, };
+
+       initialize_datacontrol_provider();
+
+       event_callback.create = service_app_create;
+       event_callback.terminate = service_app_terminate;
+       event_callback.app_control = service_app_control;
+
+       return service_app_main(argc, argv, &event_callback, NULL);
+}
diff --git a/db-service/download-db-svc.h b/db-service/download-db-svc.h
new file mode 100644 (file)
index 0000000..150e4c5
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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
+ *
+ * http://floralicense.org/license
+ *
+ * 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.
+ *
+ */
+#pragma once
+
+#include <app.h>
+
+#define PKGNAME "download-db-service"
+
+#if !defined(PACKAGEID)
+#define PACKAGEID "org.tizen.download-manager"
+#endif
diff --git a/download_db_service/include/download-db-service.h b/download_db_service/include/download-db-service.h
deleted file mode 100755 (executable)
index 132f3d1..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-\r
-\r
-\r
-\r
-#define __DOWNLOAD_DB_SERVICE_H__\r
-\r
-#include <app.h>\r
-#include "data_control.h"\r
-\r
-#define PKGNAME "download-db-service"\r
-\r
-#if !defined(PACKAGEID)\r
-#define PACKAGEID "org.tizen.download-manager"\r
-#endif\r
-\r
-\r
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/include/download-manager-common.h
rename to src/download-mgr-common.h
index ef33bf6..70769a3
@@ -18,8 +18,8 @@
 #define DOWNLOAD_MANAGER_DOWNLOAD_COMMON_H
 
 #include <libintl.h>
-#include "download-manager-debug.h"
 #include <tzplatform_config.h>
+#include "download-mgr-debug.h"
 
 #define _EDJ(o) elm_layout_edje_get(o)
 #define __(s) dgettext(PROJ_NAME, s)
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/download-manager-dateTime.cpp
rename to src/download-mgr-dateTime.cpp
index 0d08c9d..9d51ed4
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include <string>
 #include <stdlib.h>
 #include <system_settings.h>
-#include "download-manager-dateTime.h"
+#include "download-mgr-dateTime.h"
 
 #define MAX_SKELETON_BUFFER_LEN 16
 #define MAX_PATTERN_BUFFER_LEN 64
@@ -200,4 +199,3 @@ void DateUtil::getDateStr(double finishTime, string &outBuf)
                outBuf = string(DM_POP_TEXT_ERROR);
        }
 }
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from src/include/download-manager-dateTime.h
rename to src/download-mgr-dateTime.h
index 659f06b..a156d1d
@@ -21,7 +21,7 @@
 #include <time.h>
 #include <utils_i18n.h>
 
-#include "download-manager-common.h"
+#include "download-mgr-common.h"
 
 using namespace std;
 
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/include/download-manager-debug.h
rename to src/download-mgr-debug.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/download-manager-downloadItem.cpp
rename to src/download-mgr-downloadItem.cpp
index 1ea5f1b..42deeb6
 #include <string.h>
 #include <errno.h>
 #include "curl/curl.h"
-#include "download-manager-network.h"
+#include "download-mgr-network.h"
 #endif
-#include "download-manager-downloadItem.h"
-#include "download-manager-common.h"
-#include "download-manager-util.h"
+#include "download-mgr-downloadItem.h"
+#include "download-mgr-common.h"
+#include "download-mgr-util.h"
 
 #ifdef _ENABLE_OMA_DOWNLOAD
 #define DD_MIME_STR "application/vnd.oma.dd+xml"
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from src/include/download-manager-downloadItem.h
rename to src/download-mgr-downloadItem.h
index 57eebc5..6da43d8
@@ -20,9 +20,9 @@
 #include <memory>
 #include "download_product.h"
 #include "download.h"
-#include "download-manager-common.h"
-#include "download-manager-downloadRequest.h"
-#include "download-manager-event.h"
+#include "download-mgr-common.h"
+#include "download-mgr-downloadRequest.h"
+#include "download-mgr-event.h"
 #ifdef _ENABLE_OMA_DOWNLOAD
 #include "oma-parser-interface.h"
 #include "Eina.h"
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from src/download-manager-downloadRequest.cpp
rename to src/download-mgr-downloadRequest.cpp
index 9e7f2e8..8d41b6a
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "download-manager-downloadRequest.h"
+#include "download-mgr-downloadRequest.h"
 
 DownloadRequest::DownloadRequest(string url, string reqHeaderField, string reqHeaderValue,
                string installDir, string fileName)
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/include/download-manager-downloadRequest.h
rename to src/download-mgr-downloadRequest.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 95%
rename from src/download-manager-event.cpp
rename to src/download-mgr-event.cpp
index 277bc91..861d1b6
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "download-manager-event.h"
-#include "download-manager-common.h"
+#include "download-mgr-event.h"
+#include "download-mgr-common.h"
 
 #include <iostream>
 
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/include/download-manager-event.h
rename to src/download-mgr-event.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/download-manager-history-db.cpp
rename to src/download-mgr-history-db.cpp
index 6386d2b..3028ef5
@@ -15,8 +15,8 @@
  */
 
 #include <sstream>
-#include "download-manager-common.h"
-#include "download-manager-history-db.h"
+#include "download-mgr-common.h"
+#include "download-mgr-history-db.h"
 
 #define FINALIZE_ON_ERROR(stmt) { \
        DM_LOGE("SQL error:%d[%s]", ret, sqlite3_errmsg(historyDb));\
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from src/include/download-manager-history-db.h
rename to src/download-mgr-history-db.h
index 9a77f29..004dee1
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #ifndef DOWNLOAD_MANAGER_HISTORY_DB_H
 #define DOWNLOAD_MANAGER_HISTORY_DB_H
 
 #include <string>
 #include <queue>
 #include <sqlite3.h>
-#include "download-manager-item.h"
+#include "download-mgr-item.h"
 #include "data_control.h"
 extern "C" {
 #include <unicode/utypes.h>
@@ -84,4 +83,3 @@ private:
 };
 
 #endif /* DOWNLOAD_MANAGER_HISTORY_DB_H */
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from src/download-manager-item.cpp
rename to src/download-mgr-item.cpp
index 53869de..a0e24e2
 
 #include <iostream>
 #include <time.h>
-#include "download-manager-item.h"
-#include "download-manager-common.h"
-#include "download-manager-items.h"
-#include "download-manager-viewItem.h"
-#include "download-manager-history-db.h"
-#include "download-manager-network.h"
-#include "download-manager-notification.h"
+#include "download-mgr-item.h"
+#include "download-mgr-common.h"
+#include "download-mgr-items.h"
+#include "download-mgr-viewItem.h"
+#include "download-mgr-history-db.h"
+#include "download-mgr-network.h"
+#include "download-mgr-notification.h"
 
 Item::Item()
        : m_state(ITEM::IDLE)
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from src/include/download-manager-item.h
rename to src/download-mgr-item.h
index 26d3e04..4b315a3
 
 #include <string>
 #include <memory>
-#include "download-manager-event.h"
-#include "download-manager-downloadRequest.h"
-#include "download-manager-downloadItem.h"
-#include "download-manager-util.h"
+#include "download-mgr-event.h"
+#include "download-mgr-downloadRequest.h"
+#include "download-mgr-downloadItem.h"
+#include "download-mgr-util.h"
 #ifdef _ENABLE_OMA_DOWNLOAD
 #include "Ecore.h"
 #endif
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from src/download-manager-items.cpp
rename to src/download-mgr-items.cpp
index 6a14cdd..4c47e7b
@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#include "download-manager-items.h"
+#include "download-mgr-items.h"
 
 void Items::attachItem(Item *item)
 {
@@ -58,4 +57,3 @@ int Items::checkQueuedItem()
        }
        return count;
 }
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 96%
rename from src/include/download-manager-items.h
rename to src/download-mgr-items.h
index d8b219d..b2efee9
@@ -17,7 +17,7 @@
 #ifndef DOWNLOAD_MANAGER_ITEMS_H
 #define DOWNLOAD_MANAGER_ITEMS_H
 
-#include "download-manager-item.h"
+#include "download-mgr-item.h"
 #include <vector>
 
 class Items {
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from src/main.cpp
rename to src/download-mgr-main.cpp
index a4d602e..f258fec
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include <list>
 #include <string>
 #include <iostream>
 #include <oma-parser-interface.h>
 #endif
 
-#include "download-manager-common.h"
-#include "download-manager-view.h"
-#include "download-manager-network.h"
-#include "download-manager-downloadRequest.h"
-#include "download-manager-history-db.h"
-#include "download-manager-notification.h"
+#include "download-mgr-common.h"
+#include "download-mgr-view.h"
+#include "download-mgr-network.h"
+#include "download-mgr-downloadRequest.h"
+#include "download-mgr-history-db.h"
+#include "download-mgr-notification.h"
 
 #ifndef EXPORT_API
 #define EXPORT_API __attribute__((visibility("default")))
@@ -424,4 +423,3 @@ EXPORT_API int main(int argc, char *argv[])
 
        return ret;
 }
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 94%
rename from src/download-manager-network.cpp
rename to src/download-mgr-network.cpp
index c1f5f0d..837e9c1
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include <stdlib.h>
-#include "download-manager-common.h"
-#include "download-manager-network.h"
+#include "download-mgr-common.h"
+#include "download-mgr-network.h"
 
 #include "net_connection.h"
 
@@ -57,5 +56,3 @@ string NetMgr::getProxy()
        }
        return proxyStr;
 }
-
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 95%
rename from src/include/download-manager-network.h
rename to src/download-mgr-network.h
index e49c234..e26edb9
@@ -17,7 +17,7 @@
 #ifndef DOWNLOAD_MANAGER_NETWORK_H
 #define DOWNLOAD_MANAGER_NETWORK_H
 
-#include "download-manager-event.h"
+#include "download-mgr-event.h"
 
 class NetMgr {
 public:
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/download-manager-notification.cpp
rename to src/download-mgr-notification.cpp
index 36cc796..3ec2073
@@ -19,7 +19,7 @@
 
 #include "app_control.h"
 #include "app_control_internal.h"
-#include "download-manager-notification.h"
+#include "download-mgr-notification.h"
 
 DownloadNoti::DownloadNoti(Item *item)
        : m_notiHandle(NULL)
old mode 100755 (executable)
new mode 100644 (file)
similarity index 93%
rename from src/include/download-manager-notification.h
rename to src/download-mgr-notification.h
index bbfa5f8..9cf5b36
@@ -21,9 +21,9 @@
 #include "notification_internal.h"
 #include "notification_text_domain.h"
 
-#include "download-manager-common.h"
-#include "download-manager-event.h"
-#include "download-manager-item.h"
+#include "download-mgr-common.h"
+#include "download-mgr-event.h"
+#include "download-mgr-item.h"
 #include <memory>
 
 class DownloadNoti
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/download-manager-util.cpp
rename to src/download-mgr-util.cpp
index 549f9c7..6b72456
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include <stdio.h>
 #include <string.h>
 #include <dlfcn.h>
@@ -34,7 +33,7 @@
 #include "vconf.h"
 #include "mime_type.h"
 
-#include "download-manager-util.h"
+#include "download-mgr-util.h"
 
 struct MimeTableType
 {
@@ -43,7 +42,7 @@ struct MimeTableType
 };
 
 #define MAX_SUFFIX_COUNT               1000000000
-#define MAX_MIME_TABLE_NUM     15
+#define MAX_MIME_TABLE_NUM     15
 const char *ambiguousMIMETypeList[] = {
                "text/plain",
                "application/octet-stream"
@@ -652,4 +651,3 @@ bool DownloadDrm::validRo(const char *filePath)
        return false;
 }
 #endif
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from src/include/download-manager-util.h
rename to src/download-mgr-util.h
index e0fa9fc..dbc3563
@@ -18,7 +18,7 @@
 #define DOWNLOAD_MANAGER_UTIL_H
 
 #include <string>
-#include "download-manager-common.h"
+#include "download-mgr-common.h"
 
 using namespace std;
 
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/download-manager-view.cpp
rename to src/download-mgr-view.cpp
index 2cdce0a..72e73b1
@@ -19,9 +19,9 @@
 //#include "utilX.h"
 #include <efl_extension.h>
 
-#include "download-manager-view.h"
-#include "download-manager-history-db.h"
-#include "download-manager-dateTime.h"
+#include "download-mgr-view.h"
+#include "download-mgr-history-db.h"
+#include "download-mgr-dateTime.h"
 
 static void destroy_window_cb(void *data, Evas_Object *obj, void *event);
 
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from src/include/download-manager-view.h
rename to src/download-mgr-view.h
index af9ce97..7309d15
@@ -21,9 +21,9 @@
 #include <libintl.h>
 
 #include <vector>
-#include "download-manager-common.h"
-#include "download-manager-viewItem.h"
-#include "download-manager-dateTime.h"
+#include "download-mgr-common.h"
+#include "download-mgr-viewItem.h"
+#include "download-mgr-dateTime.h"
 #include "vconf.h"
 
 enum {
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/download-manager-viewItem.cpp
rename to src/download-mgr-viewItem.cpp
index cdc88e8..ba7ec02
@@ -16,9 +16,9 @@
 
 #include <stdio.h>
 
-#include "download-manager-viewItem.h"
-#include "download-manager-items.h"
-#include "download-manager-view.h"
+#include "download-mgr-viewItem.h"
+#include "download-mgr-items.h"
+#include "download-mgr-view.h"
 
 Elm_Genlist_Item_Class ViewItem::dldGenlistStyle;
 Elm_Genlist_Item_Class ViewItem::dldHistoryGenlistStyle;
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from src/include/download-manager-viewItem.h
rename to src/download-mgr-viewItem.h
index 3f99c19..748b249
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #ifndef DOWNLOAD_MANAGER_VIEW_ITEM_H
 #define DOWNLOAD_MANAGER_VIEW_ITEM_H
 
-#include "download-manager-event.h"
-#include "download-manager-item.h"
-#include <Elementary.h>
 #include <memory>
+#include <Elementary.h>
+#include "download-mgr-event.h"
+#include "download-mgr-item.h"
 
 using namespace std;