Replace types_internal.h with Types.h

Change-Id: I42b9cacfbb60b628402419bd868555a670ecbf65
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/src/ClientRequest.cpp b/src/ClientRequest.cpp
index f2f81d5..d3aefec 100644 (file)
--- a/src/ClientRequest.cpp
+++ b/src/ClientRequest.cpp
@@ -17,7 +17,8 @@
 #include <unistd.h>
 #include <glib.h>
 #include <app_manager.h>
-#include <types_internal.h>
+#include <Types.h>
+#include <DBusTypes.h>
 #include "DBusServer.h"
 #include "access_control/PeerCreds.h"
 #include "ClientRequest.h"

diff --git a/src/ContextManagerImpl.cpp b/src/ContextManagerImpl.cpp
index 9c3438c..00f27d3 100644 (file)
--- a/src/ContextManagerImpl.cpp
+++ b/src/ContextManagerImpl.cpp
@@ -17,7 +17,8 @@
 #include <glib.h>
 #include <list>
 
-#include <types_internal.h>
+#include <Types.h>
+#include <DBusTypes.h>
 #include <context_trigger_types_internal.h>
 #include <Json.h>
 #include "Server.h"

diff --git a/src/DBusServer.cpp b/src/DBusServer.cpp
index 54aa249..7b6bcde 100644 (file)
--- a/src/DBusServer.cpp
+++ b/src/DBusServer.cpp
@@ -17,7 +17,8 @@
 #include <signal.h>
 #include <app_manager.h>
 
-#include <types_internal.h>
+#include <Types.h>
+#include <DBusTypes.h>
 #include "Server.h"
 #include "ClientRequest.h"
 #include "access_control/PeerCreds.h"

diff --git a/src/ProviderHandler.cpp b/src/ProviderHandler.cpp
index 2e1b3fe..fd92e62 100644 (file)
--- a/src/ProviderHandler.cpp
+++ b/src/ProviderHandler.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <glib.h>
-#include <types_internal.h>
+#include <Types.h>
 #include <Json.h>
 #include "access_control/Privilege.h"
 #include "Server.h"

diff --git a/src/Request.cpp b/src/Request.cpp
index 32745c0..d900fcc 100644 (file)
--- a/src/Request.cpp
+++ b/src/Request.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <glib.h>
-#include <types_internal.h>
+#include <Types.h>
 #include "Request.h"
 
 ctx::RequestInfo::RequestInfo(int type, int reqId, const char* subj, const char* desc) :

diff --git a/src/Server.cpp b/src/Server.cpp
index ce77559..879d294 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -19,7 +19,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <types_internal.h>
+#include <Types.h>
 #include "DBusServer.h"
 #include "ContextManagerImpl.h"
 #include "trigger/Trigger.h"

diff --git a/src/access_control/PeerCreds.cpp b/src/access_control/PeerCreds.cpp
index 9de5fa4..4fee21e 100644 (file)
--- a/src/access_control/PeerCreds.cpp
+++ b/src/access_control/PeerCreds.cpp
@@ -18,7 +18,7 @@
 #include <cynara-session.h>
 #include <app_manager.h>
 #include <package_manager.h>
-#include <types_internal.h>
+#include <Types.h>
 #include "PeerCreds.h"
 
 ctx::Credentials::Credentials(char *pkgId, char *cli, char *sess, char *usr) :

diff --git a/src/access_control/Privilege.cpp b/src/access_control/Privilege.cpp
index d52a52e..e5ddd51 100644 (file)
--- a/src/access_control/Privilege.cpp
+++ b/src/access_control/Privilege.cpp
@@ -16,7 +16,7 @@
 
 #include <string>
 #include <cynara-client.h>
-#include <types_internal.h>
+#include <Types.h>
 #include "PeerCreds.h"
 #include "Privilege.h"
 

diff --git a/src/trigger/ContextMonitor.cpp b/src/trigger/ContextMonitor.cpp
index d2a23bb..386eaa4 100644 (file)
--- a/src/trigger/ContextMonitor.cpp
+++ b/src/trigger/ContextMonitor.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <types_internal.h>
+#include <Types.h>
 #include "../access_control/Privilege.h"
 #include "../ContextManagerImpl.h"
 #include "ContextMonitor.h"
@@ -187,7 +187,7 @@ bool ContextMonitor::isAllowed(const char *client, const char *subject)
        return true;
 }
 
-int ContextMonitor::__findSub(request_type type, const char* subject, Json* option)
+int ContextMonitor::__findSub(RequestType type, const char* subject, Json* option)
 {
        // @return      request id
        std::map<int, SubscrInfo*>* map = (type == REQ_SUBSCRIBE)? &__subscrMap : &___readMap;
@@ -206,7 +206,7 @@ int ContextMonitor::__findSub(request_type type, const char* subject, Json* opti
        return -1;
 }
 
-bool ContextMonitor::__addSub(request_type type, int sid, const char* subject, Json* option, IContextListener* listener)
+bool ContextMonitor::__addSub(RequestType type, int sid, const char* subject, Json* option, IContextListener* listener)
 {
        std::map<int, SubscrInfo*>* map = (type == REQ_SUBSCRIBE)? &__subscrMap : &___readMap;
 
@@ -218,7 +218,7 @@ bool ContextMonitor::__addSub(request_type type, int sid, const char* subject, J
        return true;
 }
 
-void ContextMonitor::__removeSub(request_type type, const char* subject, Json* option)
+void ContextMonitor::__removeSub(RequestType type, const char* subject, Json* option)
 {
        std::map<int, SubscrInfo*>* map = (type == REQ_SUBSCRIBE)? &__subscrMap : &___readMap;
 
@@ -236,7 +236,7 @@ void ContextMonitor::__removeSub(request_type type, const char* subject, Json* o
        }
 }
 
-void ContextMonitor::__removeSub(request_type type, int sid)
+void ContextMonitor::__removeSub(RequestType type, int sid)
 {
        std::map<int, SubscrInfo*>* map = (type == REQ_SUBSCRIBE)? &__subscrMap : &___readMap;
 
@@ -249,7 +249,7 @@ void ContextMonitor::__removeSub(request_type type, int sid)
        return;
 }
 
-int ContextMonitor::__addListener(request_type type, int sid, IContextListener* listener)
+int ContextMonitor::__addListener(RequestType type, int sid, IContextListener* listener)
 {
        // @return      number of listeners for the corresponding sid
        std::map<int, SubscrInfo*>* map = (type == REQ_SUBSCRIBE)? &__subscrMap : &___readMap;
@@ -262,7 +262,7 @@ int ContextMonitor::__addListener(request_type type, int sid, IContextListener*
        return info->listenerList.size();
 }
 
-int ContextMonitor::__removeListener(request_type type, int sid, IContextListener* listener)
+int ContextMonitor::__removeListener(RequestType type, int sid, IContextListener* listener)
 {
        // @return      number of listeners for the corresponding sid
        std::map<int, SubscrInfo*>* map = (type == REQ_SUBSCRIBE)? &__subscrMap : &___readMap;

diff --git a/src/trigger/ContextMonitor.h b/src/trigger/ContextMonitor.h
index 38b4d21..a681d69 100644 (file)
--- a/src/trigger/ContextMonitor.h
+++ b/src/trigger/ContextMonitor.h
@@ -20,6 +20,7 @@
 #include <list>
 #include <map>
 #include <Json.h>
+#include <DBusTypes.h>
 
 namespace ctx {
 
@@ -76,12 +77,12 @@ namespace trigger {
                std::map<int, SubscrInfo*> __subscrMap;
                std::map<int, SubscrInfo*> ___readMap;
 
-               int __findSub(request_type type, const char *subject, Json *option);
-               bool __addSub(request_type type, int sid, const char *subject, Json *option, IContextListener* listener);
-               void __removeSub(request_type type, const char *subject, Json *option);
-               void __removeSub(request_type type, int sid);
-               int __addListener(request_type type, int sid, IContextListener* listener);
-               int __removeListener(request_type type, int sid, IContextListener* listener);
+               int __findSub(RequestType type, const char *subject, Json *option);
+               bool __addSub(RequestType type, int sid, const char *subject, Json *option, IContextListener* listener);
+               void __removeSub(RequestType type, const char *subject, Json *option);
+               void __removeSub(RequestType type, int sid);
+               int __addListener(RequestType type, int sid, IContextListener* listener);
+               int __removeListener(RequestType type, int sid, IContextListener* listener);
 
        };      /* class ContextMonitor */
 

diff --git a/src/trigger/FactRequest.cpp b/src/trigger/FactRequest.cpp
index 4483a81..fc09d9d 100644 (file)
--- a/src/trigger/FactRequest.cpp
+++ b/src/trigger/FactRequest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <types_internal.h>
+#include <Types.h>
 #include "FactRequest.h"
 
 using namespace ctx;

diff --git a/src/trigger/RuleEvaluator.cpp b/src/trigger/RuleEvaluator.cpp
index a35daf8..66a55c6 100644 (file)
--- a/src/trigger/RuleEvaluator.cpp
+++ b/src/trigger/RuleEvaluator.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <Json.h>
-#include <types_internal.h>
+#include <Types.h>
 #include <context_trigger_types_internal.h>
 #include "RuleEvaluator.h"
 #include "FactTypes.h"

diff --git a/src/trigger/TemplateManager.cpp b/src/trigger/TemplateManager.cpp
index 1d664ec..1761650 100644 (file)
--- a/src/trigger/TemplateManager.cpp
+++ b/src/trigger/TemplateManager.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <sstream>
-#include <types_internal.h>
+#include <Types.h>
 #include <context_trigger_types_internal.h>
 #include "../ContextManagerImpl.h"
 #include "RuleManager.h"

diff --git a/src/trigger/Timer.cpp b/src/trigger/Timer.cpp
index 8bf1701..967d7f2 100644 (file)
--- a/src/trigger/Timer.cpp
+++ b/src/trigger/Timer.cpp
@@ -16,7 +16,7 @@
 
 #include <context_trigger.h>
 #include <context_trigger_types_internal.h>
-#include <types_internal.h>
+#include <Types.h>
 #include <TimerManager.h>
 #include "Timer.h"
 

diff --git a/src/trigger/Trigger.cpp b/src/trigger/Trigger.cpp
index d7276c1..7cfdbe2 100644 (file)
--- a/src/trigger/Trigger.cpp
+++ b/src/trigger/Trigger.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <types_internal.h>
+#include <Types.h>
 #include <context_trigger_types_internal.h>
 #include "Trigger.h"
 #include "ContextMonitor.h"