dbg.h file is removed.

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

diff --git a/include/dbg.h b/include/dbg.h
deleted file mode 100644 (file)
index 4fbaaa7..0000000
--- a/include/dbg.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-
-#ifndef __DBG_H__
-#define __DBG_H__
-
-#include <dlog.h>
-
-#ifdef LOG_TAG
-#undef LOG_TAG
-#endif
-#define LOG_TAG "org.tizen.homescreen-tv-ref"
-
-#ifndef _ERR
-#define _ERR(fmt, args...) LOGE("[%s:%d] "fmt"\n", __func__, __LINE__, ##args)
-#endif
-
-#ifndef _DBG
-#define _DBG(fmt, args...) LOGD("[%s:%d] "fmt"\n", __func__, __LINE__, ##args)
-#endif
-
-#ifndef _INFO
-#define _INFO(fmt, args...) LOGI("[%s:%d] "fmt"\n", __func__, __LINE__, ##args)
-#endif
-
-
-#endif /* __DBG_H__ */

diff --git a/src/BaseBus.cpp b/src/BaseBus.cpp
index add1f70..d2a7550 100644 (file)
--- a/src/BaseBus.cpp
+++ b/src/BaseBus.cpp
@@ -18,19 +18,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <AppCommon.h>
+
 #include "Parcel.h"
-#include "dbg.h"
 #include "BaseBus.h"
 
 
-#define _CREATE_BEGIN           int ___fail = 0;
-#define _CHECK(exp)             do {  if (!(exp)) { ___fail = 1; _DBG("_CHECK FAIL"); break; }
-#define _CHECK_FAIL             } while (0); if (___fail != 0) ___fail++; if (___fail > 2)
-#define _CREATE_END_AND_CATCH   if (___fail != 0)
-#define _WHEN_SUCCESS           if (___fail == 0)
-#define _COMMAND                if (___fail == 0)
-
-
 struct SBaseBus {
        CBaseBus::SCallback cb;
 

diff --git a/src/Bus.cpp b/src/Bus.cpp
index c39988c..3ab4ada 100644 (file)
--- a/src/Bus.cpp
+++ b/src/Bus.cpp
@@ -18,8 +18,7 @@
 #include <stdlib.h>
 
 #include "Bus.h"
-#include "dbg.h"
-#include "common.h"
+#include <AppCommon.h>
 
 #define TLM_SEAT_ID "seat0"
 #define TLM_DBUS_ROOT_SOCKET_PATH "/var/run/tlm/dbus-sock"

diff --git a/src/ClientBus.cpp b/src/ClientBus.cpp
index ff9fe81..07e68ab 100644 (file)
--- a/src/ClientBus.cpp
+++ b/src/ClientBus.cpp
@@ -17,8 +17,9 @@
 #include <gio/gio.h>
 #include <stdlib.h>
 
+#include <AppCommon.h>
+
 #include "Parcel.h"
-#include "dbg.h"
 #include "ClientBus.h"
 
 

diff --git a/src/Parcel.cpp b/src/Parcel.cpp
index 1618b48..c7668c5 100644 (file)
--- a/src/Parcel.cpp
+++ b/src/Parcel.cpp
@@ -17,7 +17,7 @@
 #include <gio/gio.h>
 #include <stdlib.h>
 
-#include "dbg.h"
+#include <AppCommon.h>
 #include "Parcel.h"
 
 

diff --git a/src/common.h b/src/common.h
deleted file mode 100644 (file)
index 06f5675..0000000
--- a/src/common.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __COMMON_H__
-#define __COMMON_H__
-
-
-#include "dbg.h"
-
-
-#define  ASSERT(exp)   if (!(exp)) { _DBG(#exp); int* a = 0; *a = 5; }
-
-#define _CREATE_BEGIN           int ___fail = 0;
-#define _CHECK(exp)             do {  if (!(exp)) { ___fail = 1; _DBG("_CHECK FAIL"); break; }
-#define _CHECK_FAIL             } while (0); if (___fail != 0) ___fail++; if (___fail > 2)
-#define _CREATE_END_AND_CATCH   if (___fail != 0)
-#define _WHEN_SUCCESS           if (___fail == 0)
-#define _COMMAND                if (___fail == 0)
-
-
-#endif /* __COMMON_H__ */

diff --git a/src/custombar.cpp b/src/custombar.cpp
index 91d9b2f..824c3cf 100644 (file)
--- a/src/custombar.cpp
+++ b/src/custombar.cpp
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include <ctype.h>
 
-#include "AppCommon.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "bar.h"
 #include "engine.h"
 #include "defs.h"
-#include "dbg.h"
 
 #define KEY_LONG_DUR 1.0
 #define EDIT_ARROW_UP_H 50

diff --git a/src/deletebar.cpp b/src/deletebar.cpp
index 748b92a..c0c8cfa 100644 (file)
--- a/src/deletebar.cpp
+++ b/src/deletebar.cpp
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include <ctype.h>
 
-#include "AppCommon.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "bar.h"
 #include "engine.h"
 #include "defs.h"
-#include "dbg.h"
 
 #define XBAR_W 647
 #define XBAR_H 31

diff --git a/src/dynamicbar.cpp b/src/dynamicbar.cpp
index 3684664..a1bf775 100644 (file)
--- a/src/dynamicbar.cpp
+++ b/src/dynamicbar.cpp
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include <ctype.h>
 #include <string.h>
 
-#include "AppCommon.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "bar.h"
 #include "engine.h"
 #include "defs.h"
-#include "dbg.h"
 
 #define STYLE_TITLE "title"
 #define STYLE_VIDEO "video"

diff --git a/src/engine.cpp b/src/engine.cpp
index a28eb7e..a2fc773 100644 (file)
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -30,12 +30,13 @@
 #include <cynara-client.h>
 #include <pwd.h>
 
-#include "common.h"
+#include <AppCommon.h>
+
 #include "Bus.h"
 #include "engine.h"
 #include "ClientBus.h"
 #include "defs.h"
-#include "dbg.h"
+
 
 #define SECTION_USER "user"
 #define SECTION_UBAR_ITEMS "ubar.items"

diff --git a/src/engine/src/EngineBarItem.cpp b/src/engine/src/EngineBarItem.cpp
index 83b6b59..bf16cf6 100644 (file)
--- a/src/engine/src/EngineBarItem.cpp
+++ b/src/engine/src/EngineBarItem.cpp
@@ -20,9 +20,9 @@
 #include <glib.h>
 
 #include <app-content.h>
+#include <AppCommon.h>
 
 #include "../../engine.h"
-#include "../../common.h"
 #include "../include/EngineBarItem.h"
 
 

diff --git a/src/engine/src/EngineDBarItem.cpp b/src/engine/src/EngineDBarItem.cpp
index f92b18e..79a2a50 100644 (file)
--- a/src/engine/src/EngineDBarItem.cpp
+++ b/src/engine/src/EngineDBarItem.cpp
@@ -21,8 +21,9 @@
 
 #include <app-content.h>
 
+#include <AppCommon.h>
+
 #include "../../Bus.h"
-#include "../../common.h"
 #include "../../engine.h"
 #include "../include/EngineBarItem.h"
 #include "../include/EngineDBarItem.h"

diff --git a/src/engine/src/EngineDBarItemContent.cpp b/src/engine/src/EngineDBarItemContent.cpp
index 7b7ae33..3958c96 100644 (file)
--- a/src/engine/src/EngineDBarItemContent.cpp
+++ b/src/engine/src/EngineDBarItemContent.cpp
@@ -16,7 +16,8 @@
 
 #include <string.h>
 
-#include "../../common.h"
+#include <AppCommon.h>
+
 #include "../include/EngineDBarItemContent.h"
 
 

diff --git a/src/engine/src/EngineUBarItem.cpp b/src/engine/src/EngineUBarItem.cpp
index 25c8438..12030e4 100644 (file)
--- a/src/engine/src/EngineUBarItem.cpp
+++ b/src/engine/src/EngineUBarItem.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include <gum/gum-user.h>
 #include <gum/gum-user-service.h>
 #include <gum/common/gum-user-types.h>
-#include "../../common.h"
+
+#include <AppCommon.h>
+
 #include "../../engine.h"
 #include "../include/EngineUBarItem.h"
 

diff --git a/src/engine/src/Entity.cpp b/src/engine/src/Entity.cpp
index 415af8a..b53ac8e 100644 (file)
--- a/src/engine/src/Entity.cpp
+++ b/src/engine/src/Entity.cpp
@@ -15,8 +15,8 @@
  */
 
 #include <string.h>
-#include "dbg.h"
-#include "../../common.h"
+#include <AppCommon.h>
+
 #include "../include/Entity.h"
 
 

diff --git a/src/homebar.cpp b/src/homebar.cpp
index 01438bc..3e4f12b 100644 (file)
--- a/src/homebar.cpp
+++ b/src/homebar.cpp
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
 #include <ctype.h>
 
-#include "AppCommon.h"
+#include <AppCommon.h>
+
 #include "i18n.h"
 #include "bar.h"
 #include "engine.h"
 #include "defs.h"
-#include "dbg.h"
 
 enum _hbar_state {
        HBAR_STATE_HIDE,

diff --git a/src/homescreen.cpp b/src/homescreen.cpp
index e457eea..e2e3b84 100644 (file)
--- a/src/homescreen.cpp
+++ b/src/homescreen.cpp
@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-
-#include "AppCommon.h"
+#include <AppCommon.h>
 #include "bar.h"
 #include "engine.h"
 #include "defs.h"
-#include "dbg.h"
 
 enum _hscr_state {
        HOMESCREEN_STATE_HIDE,

diff --git a/src/main.cpp b/src/main.cpp
index 4039c0f..9ad4e55 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,7 +19,11 @@
 
 #include "homescreen.h"
 #include "engine.h"
-#include "dbg.h"
+#include <AppCommon.h>
+
+
+SET_TAG("org.tizen.homescreen-tv-ref");
+
 
 struct _appdata {
        const char *name;

diff --git a/src/userbar.cpp b/src/userbar.cpp
index f9dbeb8..fab5f60 100644 (file)
--- a/src/userbar.cpp
+++ b/src/userbar.cpp
@@ -17,12 +17,11 @@
 #include <Elementary.h>
 #include <ctype.h>
 
-#include "AppCommon.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "bar.h"
 #include "engine.h"
 #include "defs.h"
-#include "dbg.h"
 
 #define BTN_MAX 3
 #define UBAR_POPUP_PADDING_X 30