utils: rename log.h => Log.h, remove redundant file

Change-Id: I0c0e5461b1ad6d2a28831fc748f5eb71ce2bfa7d

diff --git a/clock/inc/Model/Alarm.h b/clock/inc/Model/Alarm.h
index e3cdcaa..b51d5c1 100644 (file)
--- a/clock/inc/Model/Alarm.h
+++ b/clock/inc/Model/Alarm.h
@@ -8,8 +8,7 @@
 #include "Model/WeekFlags.h"
 #include "Utils/Serialization.h"
 #include "Utils/Time.h"
-
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace model {
        typedef int AlarmId;

diff --git a/clock/inc/Model/Counter.h b/clock/inc/Model/Counter.h
index b120e43..abbfa3f 100644 (file)
--- a/clock/inc/Model/Counter.h
+++ b/clock/inc/Model/Counter.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 #include <Ecore.h>
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace model {
 

diff --git a/clock/inc/Utils/Log.h b/clock/inc/Utils/Log.h
index 30bc0d7..06ed9a7 100644 (file)
--- a/clock/inc/Utils/Log.h
+++ b/clock/inc/Utils/Log.h
@@ -1,9 +1,63 @@
-#ifndef _CLOCK_LOC
-#define _CLOCK_LOC
+/*
+ * Copyright (c) 2009-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.
+ */
 
-namespace utils {
-       class Log {
-       };
-} /* utils */
+#ifndef __LOG_H__
+#define __LOG_H__
+
+#include <dlog.h>
+#include <app_i18n.h>
+
+/**
+ * @addtogroup Utils
+ * @{
+ */
+
+#ifdef LOG_TAG
+       #undef LOG_TAG
+#endif
+
+#define LOG_TAG "CLOCK"
+
+#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
+
+#if !defined(DBG)
+#define DBG(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
+#endif
+
+#if !defined(WRN)
+#define WRN(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
+#endif
+
+#if !defined(ERR)
+#define ERR(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
+#endif
+
+#if !defined(INF)
+#define INF(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
+#endif
+
+#if !defined(FATAL)
+#define FAT(fmt, arg...) dlog_print(DLOG_FATAL, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg);
+#endif
+
+#undef _
+#define _(str) i18n_get_text(str)
+
+/**
+ * @}
+ */
 
 #endif

diff --git a/clock/inc/log.h b/clock/inc/log.h
deleted file mode 100644 (file)
index 06ed9a7..0000000
--- a/clock/inc/log.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2009-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 __LOG_H__
-#define __LOG_H__
-
-#include <dlog.h>
-#include <app_i18n.h>
-
-/**
- * @addtogroup Utils
- * @{
- */
-
-#ifdef LOG_TAG
-       #undef LOG_TAG
-#endif
-
-#define LOG_TAG "CLOCK"
-
-#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
-
-#if !defined(DBG)
-#define DBG(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
-#endif
-
-#if !defined(WRN)
-#define WRN(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
-#endif
-
-#if !defined(ERR)
-#define ERR(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
-#endif
-
-#if !defined(INF)
-#define INF(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
-#endif
-
-#if !defined(FATAL)
-#define FAT(fmt, arg...) dlog_print(DLOG_FATAL, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg);
-#endif
-
-#undef _
-#define _(str) i18n_get_text(str)
-
-/**
- * @}
- */
-
-#endif

diff --git a/clock/src/Clock.cpp b/clock/src/Clock.cpp
index 99dc11f..6299fc9 100644 (file)
--- a/clock/src/Clock.cpp
+++ b/clock/src/Clock.cpp
@@ -16,7 +16,7 @@
 
 #include <dlog.h>
 
-#include "log.h"
+#include "Utils/Log.h"
 #include "app.h"
 #include "Clock.h"
 #include "Controller/MainController.h"

diff --git a/clock/src/Common/CounterAnimator.cpp b/clock/src/Common/CounterAnimator.cpp
index 2411ea4..b029a29 100644 (file)
--- a/clock/src/Common/CounterAnimator.cpp
+++ b/clock/src/Common/CounterAnimator.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "Common/CounterAnimator.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace common {
 

diff --git a/clock/src/Controller/MainController.cpp b/clock/src/Controller/MainController.cpp
index 9f0c03f..8f284ac 100644 (file)
--- a/clock/src/Controller/MainController.cpp
+++ b/clock/src/Controller/MainController.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "log.h"
+#include "Utils/Log.h"
 #include "View/MainView.h"
 #include "Controller/MainController.h"
 #include "Utils/EventBus.h"

diff --git a/clock/src/Model/Alarm.cpp b/clock/src/Model/Alarm.cpp
index e9eef2c..6582e2f 100644 (file)
--- a/clock/src/Model/Alarm.cpp
+++ b/clock/src/Model/Alarm.cpp
@@ -1,7 +1,7 @@
 #include <app_alarm.h>
 #include "Model/Alarm.h"
 #include "Common/Defines.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 using namespace model;
 using namespace utils;

diff --git a/clock/src/Model/AlarmProviderFile.cpp b/clock/src/Model/AlarmProviderFile.cpp
index 038696d..d7fdb46 100644 (file)
--- a/clock/src/Model/AlarmProviderFile.cpp
+++ b/clock/src/Model/AlarmProviderFile.cpp
@@ -5,7 +5,7 @@
 #include <cstdlib>
 #include <algorithm>
 
-#include "log.h"
+#include "Utils/Log.h"
 
 using namespace internal;
 using namespace model;

diff --git a/clock/src/Model/StopWatch.cpp b/clock/src/Model/StopWatch.cpp
index 280769f..0f0c7fc 100644 (file)
--- a/clock/src/Model/StopWatch.cpp
+++ b/clock/src/Model/StopWatch.cpp
@@ -15,7 +15,6 @@
  */
 
 #include "Model/StopWatch.h"
-#include "log.h"
 
 namespace model {
 

diff --git a/clock/src/Model/Timer.cpp b/clock/src/Model/Timer.cpp
index 25ce9a6..05b845a 100644 (file)
--- a/clock/src/Model/Timer.cpp
+++ b/clock/src/Model/Timer.cpp
@@ -18,7 +18,7 @@
 
 #include "Model/Timer.h"
 #include "Common/Defines.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace model {
 

diff --git a/clock/src/Model/WorldClock.cpp b/clock/src/Model/WorldClock.cpp
index bf34870..5fcec2a 100644 (file)
--- a/clock/src/Model/WorldClock.cpp
+++ b/clock/src/Model/WorldClock.cpp
@@ -21,7 +21,7 @@
 
 #include "Model/WorldClock.h"
 #include "Model/Location.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 using namespace model;
 

diff --git a/clock/src/Presenter/AlarmPresenter.cpp b/clock/src/Presenter/AlarmPresenter.cpp
index 47a6fe7..f7631d1 100644 (file)
--- a/clock/src/Presenter/AlarmPresenter.cpp
+++ b/clock/src/Presenter/AlarmPresenter.cpp
@@ -2,7 +2,7 @@
 #include "Model/AlarmProviderEvent.h"
 #include "Model/AlarmEvent.h"
 #include "Utils/EventBus.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 using namespace presenter;
 using namespace view;

diff --git a/clock/src/Presenter/EditAlarmPresenter.cpp b/clock/src/Presenter/EditAlarmPresenter.cpp
index 4abf2a6..2133c68 100644 (file)
--- a/clock/src/Presenter/EditAlarmPresenter.cpp
+++ b/clock/src/Presenter/EditAlarmPresenter.cpp
@@ -1,5 +1,5 @@
 #include "Presenter/EditAlarmPresenter.h"
-#include "log.h"
+#include "Utils/Log.h"
 #include "Model/AlarmProvider.h"
 #include "Utils/EventBus.h"
 #include "Model/AlarmEvent.h"

diff --git a/clock/src/Presenter/StopWatchPresenter.cpp b/clock/src/Presenter/StopWatchPresenter.cpp
index b97ace6..8c2d944 100644 (file)
--- a/clock/src/Presenter/StopWatchPresenter.cpp
+++ b/clock/src/Presenter/StopWatchPresenter.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <cmath>
 #include "Presenter/StopWatchPresenter.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace presenter {
 

diff --git a/clock/src/Presenter/TimerPresenter.cpp b/clock/src/Presenter/TimerPresenter.cpp
index 285884b..89bd5ae 100644 (file)
--- a/clock/src/Presenter/TimerPresenter.cpp
+++ b/clock/src/Presenter/TimerPresenter.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "Presenter/TimerPresenter.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace presenter {
 

diff --git a/clock/src/Presenter/WorldClockPresenter.cpp b/clock/src/Presenter/WorldClockPresenter.cpp
index d6c40cb..e5fd81f 100644 (file)
--- a/clock/src/Presenter/WorldClockPresenter.cpp
+++ b/clock/src/Presenter/WorldClockPresenter.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "Presenter/WorldClockPresenter.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace presenter {
 

diff --git a/clock/src/Utils/BinaryFileWriter.cpp b/clock/src/Utils/BinaryFileWriter.cpp
index 3f66ac7..0759b52 100644 (file)
--- a/clock/src/Utils/BinaryFileWriter.cpp
+++ b/clock/src/Utils/BinaryFileWriter.cpp
@@ -1,6 +1,7 @@
 #include "Utils/BinaryFileWriter.h"
 
 #include <fstream>
+#include "Utils/Log.h"
 
 using namespace utils;
 using namespace std;

diff --git a/clock/src/Utils/EventBus.cpp b/clock/src/Utils/EventBus.cpp
index 44cb84e..34c3a86 100644 (file)
--- a/clock/src/Utils/EventBus.cpp
+++ b/clock/src/Utils/EventBus.cpp
@@ -1,7 +1,7 @@
 #include "Utils/EventBus.h"
 #include <algorithm>
 
-#include "log.h"
+#include "Utils/Log.h"
 
 using namespace utils;
 

diff --git a/clock/src/Utils/PopupManager.cpp b/clock/src/Utils/PopupManager.cpp
index da6b015..b56b43d 100644 (file)
--- a/clock/src/Utils/PopupManager.cpp
+++ b/clock/src/Utils/PopupManager.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "Utils/PopupManager.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace utils {
 

diff --git a/clock/src/Utils/Time.cpp b/clock/src/Utils/Time.cpp
index 4c66053..1583779 100644 (file)
--- a/clock/src/Utils/Time.cpp
+++ b/clock/src/Utils/Time.cpp
@@ -1,5 +1,5 @@
 #include "Utils/Time.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 #include <utils_i18n.h>
 #include <cstring>

diff --git a/clock/src/View/AlarmView.cpp b/clock/src/View/AlarmView.cpp
index 45f11dc..c0f0cb0 100644 (file)
--- a/clock/src/View/AlarmView.cpp
+++ b/clock/src/View/AlarmView.cpp
@@ -22,7 +22,7 @@
 #include <sstream>
 #include <efl_extension.h>
 
-#include "log.h"
+#include "Utils/Log.h"
 
 using namespace view;
 using namespace model;

diff --git a/clock/src/View/CounterView.cpp b/clock/src/View/CounterView.cpp
index bdab06b..7617752 100644 (file)
--- a/clock/src/View/CounterView.cpp
+++ b/clock/src/View/CounterView.cpp
@@ -19,7 +19,7 @@
 
 #include "View/CounterView.h"
 #include "Utils/Utils.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 #define SIGNAL_SET_COUNTER_SIMPLE "digits,set,simple"
 #define SIGNAL_SET_COUNTER_TIMER "digits,set,timer"

diff --git a/clock/src/View/DeleteAlarmView.cpp b/clock/src/View/DeleteAlarmView.cpp
index 964db0c..6039c5c 100644 (file)
--- a/clock/src/View/DeleteAlarmView.cpp
+++ b/clock/src/View/DeleteAlarmView.cpp
@@ -1,5 +1,5 @@
 #include "View/DeleteAlarmView.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 #include <sstream>
 

diff --git a/clock/src/View/EditAlarmView.cpp b/clock/src/View/EditAlarmView.cpp
index 7fe6392..ee6fe7c 100644 (file)
--- a/clock/src/View/EditAlarmView.cpp
+++ b/clock/src/View/EditAlarmView.cpp
@@ -4,7 +4,7 @@
 
 #include <Elementary.h>
 
-#include "log.h"
+#include "Utils/Log.h"
 
 using namespace view;
 using namespace utils;

diff --git a/clock/src/View/MainView.cpp b/clock/src/View/MainView.cpp
index fb4d36c..64e848a 100644 (file)
--- a/clock/src/View/MainView.cpp
+++ b/clock/src/View/MainView.cpp
@@ -29,7 +29,7 @@
 
 #include "Clock.h"
 #include "Utils/Utils.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 #include "Presenter/AlarmPresenter.h"
 #include "Presenter/EditAlarmPresenter.h"

diff --git a/clock/src/View/PageView.cpp b/clock/src/View/PageView.cpp
index 778aaed..e5bbe59 100644 (file)
--- a/clock/src/View/PageView.cpp
+++ b/clock/src/View/PageView.cpp
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-
-
 #include "Elementary.h"
 #include "View/MainView.h"
 #include "View/PageView.h"
 #include "Utils/Utils.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 #include <stdlib.h>
 

diff --git a/clock/src/View/RingView.cpp b/clock/src/View/RingView.cpp
index d5752d8..c894bc0 100644 (file)
--- a/clock/src/View/RingView.cpp
+++ b/clock/src/View/RingView.cpp
@@ -19,8 +19,7 @@
 #include "View/RingView.h"
 #include "View/MainView.h"
 #include "Utils/Utils.h"
-
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace view {
 

diff --git a/clock/src/View/StopWatchView.cpp b/clock/src/View/StopWatchView.cpp
index 9f06b62..311c08a 100644 (file)
--- a/clock/src/View/StopWatchView.cpp
+++ b/clock/src/View/StopWatchView.cpp
@@ -19,8 +19,7 @@
 #include "Presenter/StopWatchPresenter.h"
 #include "Utils/Utils.h"
 #include "Utils/PopupManager.h"
-
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace view {
 

diff --git a/clock/src/View/TimerView.cpp b/clock/src/View/TimerView.cpp
index 11039b6..08d7dbd 100644 (file)
--- a/clock/src/View/TimerView.cpp
+++ b/clock/src/View/TimerView.cpp
@@ -20,7 +20,7 @@
 #include "View/TimerView.h"
 #include "View/MainView.h"
 #include "Utils/Utils.h"
-#include "log.h"
+#include "Utils/Log.h"
 
 namespace view {
 

diff --git a/clock/src/View/WeekFlagsView.cpp b/clock/src/View/WeekFlagsView.cpp
index 3485188..4bb8522 100644 (file)
--- a/clock/src/View/WeekFlagsView.cpp
+++ b/clock/src/View/WeekFlagsView.cpp
@@ -4,7 +4,7 @@
 
 #include <Elementary.h>
 
-#include "log.h"
+#include "Utils/Log.h"
 
 using namespace view;
 using namespace utils;

diff --git a/clock/src/View/WorldClockView.cpp b/clock/src/View/WorldClockView.cpp
index 4705df8..567090d 100644 (file)
--- a/clock/src/View/WorldClockView.cpp
+++ b/clock/src/View/WorldClockView.cpp
@@ -26,7 +26,7 @@
 #include "Model/WorldClock.h"
 #include "Utils/Utils.h"
 #include "Internal/WorldClockDefs.h"
-#include "log.h"
+#include "Utils/Log.h"
 #include "Utils/Time.h"
 
 using namespace view;