git mv include/def.h include/common_defs.h

This is not to confuse with def.h in pulse library

Change-Id: I61b1754d9155d1c0a48a6f3e9dd0bffd5d005bf4

diff --git a/data/org.tizen.settings-tv-ref-theme.edc b/data/org.tizen.settings-tv-ref-theme.edc
index f8ece3b..610d8fc 100644 (file)
--- a/data/org.tizen.settings-tv-ref-theme.edc
+++ b/data/org.tizen.settings-tv-ref-theme.edc
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "../include/def.h"
+#include "../include/common_defs.h"
 collections {
        #include "widget/button.edc"
        #include "widget/progressbar.edc"

diff --git a/data/org.tizen.settings-tv-ref.edc b/data/org.tizen.settings-tv-ref.edc
index aef0b96..976f7ee 100644 (file)
--- a/data/org.tizen.settings-tv-ref.edc
+++ b/data/org.tizen.settings-tv-ref.edc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "../include/def.h"
+#include "../include/common_defs.h"
 
 collections {
        #include "viewer/maincatalog.edc"

diff --git a/data/viewer/maincatalog.edc b/data/viewer/maincatalog.edc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/def.h b/include/common_defs.h
similarity index 99%
rename from include/def.h
rename to include/common_defs.h
index 83af87b..fa0519e 100644 (file)
--- a/include/def.h
+++ b/include/common_defs.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __DEF_H__
-#define __DEF_H__
+#ifndef __COMMON_DEFS_H__
+#define __COMMON_DEFS_H__
 
 #define WIN_WIDTH 1920
 #define WIN_HEIGHT 1080
@@ -306,4 +306,4 @@
 #define KEY_SYSTEM_LANGUAGE "db/menu_widget/language"
 #define KEY_SYSTEM_COUNTRY "db/menu_widget/regionformat"
 
-#endif /* __DEF_H__ */
+#endif /* __COMMON_DEFS_H__ */

diff --git a/src/main.cpp b/src/main.cpp
index f05100a..c4f3084 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <ui-gadget.h>
-#include "def.h"
+#include "common_defs.h"
 #include <AppCommon.h>
 #include "settingviewmgr.h"
 #include "utils.h"

diff --git a/src/view_maincatalog.cpp b/src/view_maincatalog.cpp
index 8c76c26..a2114f7 100644 (file)
--- a/src/view_maincatalog.cpp
+++ b/src/view_maincatalog.cpp
@@ -16,7 +16,7 @@
 
 
 #include <AppCommon.h>
-#include "def.h"
+#include "common_defs.h"
 #include "stdbool.h"
 #include "settingviewmgr.h"
 #include "utils.h"

diff --git a/src/view_need_pwd.cpp b/src/view_need_pwd.cpp
old mode 100755 (executable)
new mode 100644 (file)
index c5f52c4..ef51729
--- a/src/view_need_pwd.cpp
+++ b/src/view_need_pwd.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <AppCommon.h>
-#include "def.h"
+#include "common_defs.h"
 #include "utils.h"
 #include "settings_provider.h"
 #include "view_need_pwd.h"

diff --git a/src/view_pwd_popup.cpp b/src/view_pwd_popup.cpp
old mode 100755 (executable)
new mode 100644 (file)
index f970635..ac78c3a
--- a/src/view_pwd_popup.cpp
+++ b/src/view_pwd_popup.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <AppCommon.h>
-#include "def.h"
+#include "common_defs.h"
 #include "view_pwd_popup.h"
 #include "utils.h"
 #include "settings_provider.h"

diff --git a/src/view_sublist.cpp b/src/view_sublist.cpp
index 27f5b8f..19b827b 100644 (file)
--- a/src/view_sublist.cpp
+++ b/src/view_sublist.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <AppCommon.h>
-#include "def.h"
+#include "common_defs.h"
 #include "stdbool.h"
 #include "settingviewmgr.h"
 #include "utils.h"

diff --git a/src/view_system_clock.cpp b/src/view_system_clock.cpp
index 25f7b5f..3f08dd4 100644 (file)
--- a/src/view_system_clock.cpp
+++ b/src/view_system_clock.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <AppCommon.h>
-#include "def.h"
+#include "common_defs.h"
 #include "stdbool.h"
 #include "settingviewmgr.h"
 #include "utils.h"

diff --git a/src/view_uigadget.cpp b/src/view_uigadget.cpp
index 1bed124..c0ccdb1 100644 (file)
--- a/src/view_uigadget.cpp
+++ b/src/view_uigadget.cpp
@@ -17,7 +17,7 @@
 #include <ui-gadget.h>
 #include "view_uigadget.h"
 #include <AppCommon.h>
-#include "def.h"
+#include "common_defs.h"
 #include "settingviewmgr.h"
 
 

diff --git a/ug/system/clock/CMakeLists.txt b/ug/system/clock/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/edje/CMakeLists.txt b/ug/system/clock/edje/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/edje/ug_clock.edc b/ug/system/clock/edje/ug_clock.edc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/edje/ug_clock_theme.edc b/ug/system/clock/edje/ug_clock_theme.edc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/edje/widgets/button.edc b/ug/system/clock/edje/widgets/button.edc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/include/defs.h b/ug/system/clock/include/defs.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/include/ug_clock.h b/ug/system/clock/include/ug_clock.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/include/util.h b/ug/system/clock/include/util.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/src/ClockSublistView.cpp b/ug/system/clock/src/ClockSublistView.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/src/ug_clock.cpp b/ug/system/clock/src/ug_clock.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/system/clock/src/util.cpp b/ug/system/clock/src/util.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ug/wifi-direct/src/WifiDirectMainView.cpp b/ug/wifi-direct/src/WifiDirectMainView.cpp
old mode 100755 (executable)
new mode 100644 (file)