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 f2f81d5581719ba3f8fa5827855c8aefe5a3ef26..d3aefecd72220a01b9db76e66907c4005c2ad2a5 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 9c3438c3e78b2694d32b1f670f701a08199fc65a..00f27d32d3b23ccdf0acd4e413ad660408eef51f 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 54aa249d454ffcae9c952cadae10b35958a1b32b..7b6bcde143e09745eee39f665d9c567c842f06af 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 2e1b3fef447906474039429dd862a1a1e6cda896..fd92e623e9aa67a21a10fdfd7631baadb3296594 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 32745c07ac57c64506e1d5a444ecccf45d94af03..d900fcc0a02763ce2eb9c489a8fab5ac6d44fefb 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 ce77559d14342af1fd3b2d77ab94662a1918a880..879d2946a2048a3b64f92c68f82e50004d42249c 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 9de5fa4a20c47f7ee7a416fc944ac6c4ae294de0..4fee21ebd4271e758735d4261d696dfe3bfb6e77 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 d52a52efd7f4dee1f203dbc3c0d6e4a40d90c697..e5ddd5116bc2e17c8c3fafe674dc589c8ad8f3b1 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 d2a23bb849bfee7cb40d4fcf8caa398d6aef76b9..386eaa4713d0c4991dd07f6f039f8febe050bbe4 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 38b4d2139c4b4f5ec7ea14acd3e09f62e7dd5334..a681d693a144aa2152c92b8259902630f27d1986 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 4483a81306e75c2cabcec1954a0f6ec06a89e69c..fc09d9dee02a95d4ed93e09e2aca80e36c77e931 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 a35daf85c69ccecf74768fe42a4a87e0b5f646f8..66a55c61a8335d298feaddee8daed002cd9b9b4c 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 1d664ec8e83d2982bd4003cbfe3d8a795b15ef74..176165063f1a6da480c3b07ef4cfe1bf7c708c4c 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 8bf1701324362b2446e6d16b4cdcff9ae9ae8012..967d7f2c2f5147aa8db210adab4b54c660f57a79 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 d7276c122a09640f715324d7c1be2feed74e5003..7cfdbe2614160d5272b9521026b02b16aa96be0e 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"