Modify the pb agent for gtest

Change-Id: Ia3255caee5677a6fdcaeb125b99b18c412ae54fb
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/pb-agent/bluetooth_pb_vcard.c b/pb-agent/bluetooth_pb_vcard.c
index 08aaea2..38c3838 100644 (file)
--- a/pb-agent/bluetooth_pb_vcard.c
+++ b/pb-agent/bluetooth_pb_vcard.c
@@ -41,39 +41,6 @@
 #include "bluetooth_pb_vcard.h"
 #include "bluetooth_pb_agent.h"
 
-#define VCARD_FORMAT_2_1 0x0
-#define VCARD_FORMAT_3_0 0x1
-
-#define VCARD_VERSION  (0x1)
-#define VCARD_FN       (0x1 << 1)
-#define VCARD_N                (0x1 << 2)
-#define VCARD_PHOTO    (0x1 << 3)
-#define VCARD_BDAY     (0x1 << 4)
-#define VCARD_ADR      (0x1 << 5)
-#define VCARD_LABEL    (0x1 << 6)      /* not supported */
-#define VCARD_TEL      (0x1 << 7)
-#define VCARD_EMAIL    (0x1 << 8)
-#define VCARD_MAILER   (0x1 << 9)      /* not supported */
-#define VCARD_TZ       (0x1 << 10)     /* not supported */
-#define VCARD_GEO      (0x1 << 11)     /* not supported */
-#define VCARD_TITLE    (0x1 << 12)
-#define VCARD_ROLE     (0x1 << 13)
-#define VCARD_LOGO     (0x1 << 14)     /* not supported */
-#define VCARD_AGENT    (0x1 << 15)     /* not supported */
-#define VCARD_ORG      (0x1 << 16)
-#define VCARD_NOTE     (0x1 << 17)
-#define VCARD_REV      (0x1 << 18)
-#define VCARD_SOUND    (0x1 << 19)     /* not supported */
-#define VCARD_URL      (0x1 << 20)
-#define VCARD_UID      (0x1 << 21)
-#define VCARD_KEY      (0x1 << 22)     /* not supported */
-#define VCARD_NICKNAME (0x1 << 23)
-#define VCARD_CATEGORIES       (0x1 << 24)     /* not supported */
-#define VCARD_PROID    (0x1 << 25)     /* not supported */
-#define VCARD_CLASS    (0x1 << 26)     /* not supported */
-#define VCARD_SORT_STRING      (0x1 << 27)     /* not supported */
-#define VCARD_X_IRMC_CALL_DATETIME     (0x1 << 28)
-
 #define QP_ENC_LEN     3
 #define LINEBREAK_LEN  75
 

diff --git a/pb-agent/bluetooth_pb_vcard.h b/pb-agent/bluetooth_pb_vcard.h
index c7c3a31..28b7d26 100644 (file)
--- a/pb-agent/bluetooth_pb_vcard.h
+++ b/pb-agent/bluetooth_pb_vcard.h
@@ -37,6 +37,39 @@ typedef enum {
        PBAP_ADDRESSBOOK_SIM,
 } bt_pbap_addressbook_e;
 
+#define VCARD_FORMAT_2_1 0x0
+#define VCARD_FORMAT_3_0 0x1
+
+#define VCARD_VERSION  (0x1)
+#define VCARD_FN       (0x1 << 1)
+#define VCARD_N                (0x1 << 2)
+#define VCARD_PHOTO    (0x1 << 3)
+#define VCARD_BDAY     (0x1 << 4)
+#define VCARD_ADR      (0x1 << 5)
+#define VCARD_LABEL    (0x1 << 6)      /* not supported */
+#define VCARD_TEL      (0x1 << 7)
+#define VCARD_EMAIL    (0x1 << 8)
+#define VCARD_MAILER   (0x1 << 9)      /* not supported */
+#define VCARD_TZ       (0x1 << 10)     /* not supported */
+#define VCARD_GEO      (0x1 << 11)     /* not supported */
+#define VCARD_TITLE    (0x1 << 12)
+#define VCARD_ROLE     (0x1 << 13)
+#define VCARD_LOGO     (0x1 << 14)     /* not supported */
+#define VCARD_AGENT    (0x1 << 15)     /* not supported */
+#define VCARD_ORG      (0x1 << 16)
+#define VCARD_NOTE     (0x1 << 17)
+#define VCARD_REV      (0x1 << 18)
+#define VCARD_SOUND    (0x1 << 19)     /* not supported */
+#define VCARD_URL      (0x1 << 20)
+#define VCARD_UID      (0x1 << 21)
+#define VCARD_KEY      (0x1 << 22)     /* not supported */
+#define VCARD_NICKNAME (0x1 << 23)
+#define VCARD_CATEGORIES       (0x1 << 24)     /* not supported */
+#define VCARD_PROID    (0x1 << 25)     /* not supported */
+#define VCARD_CLASS    (0x1 << 26)     /* not supported */
+#define VCARD_SORT_STRING      (0x1 << 27)     /* not supported */
+#define VCARD_X_IRMC_CALL_DATETIME     (0x1 << 28)
+
 /* vcard */
 int _bluetooth_get_contact_addressbook(gint person_id);