X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fsoft-sensor-manager%2FSSMCore%2Fsrc%2FQueryProcessor%2FContextModel.cpp;h=72a5b07197cac49a82a0d039f5ed51bdb23b2031;hb=799c201b58f3f9a859e88e9b54285b3ae956eb54;hp=20029b13d190638465cecdb5b5f9f1c9a8c970a3;hpb=28b95bdd9760f2f595f70e64bb74451bfc3adfc9;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/soft-sensor-manager/SSMCore/src/QueryProcessor/ContextModel.cpp b/service/soft-sensor-manager/SSMCore/src/QueryProcessor/ContextModel.cpp
index 20029b1..72a5b07 100644
--- a/service/soft-sensor-manager/SSMCore/src/QueryProcessor/ContextModel.cpp
+++ b/service/soft-sensor-manager/SSMCore/src/QueryProcessor/ContextModel.cpp
@@ -89,8 +89,8 @@ CLEANUP:
     return;
 }
 
-void CContextModel::registerSSMResource(IN ActivationType activationType, IN int targetDeviceDataId,
-                                        IN ISSMResource *pSSMResource)
+void CContextModel::registerSSMResource(ActivationType activationType, int targetDeviceDataId,
+                                        ISSMResource *pSSMResource)
 {
     intptr_t     *pData = NULL;
 
@@ -136,8 +136,8 @@ void CContextModel::registerSSMResource(IN ActivationType activationType, IN int
     m_mtxActivationCount.unlock();
 }
 
-void CContextModel::unregisterSSMResource(IN ActivationType activationType,
-        IN int targetDeviceDataId, IN ISSMResource *pSSMResource)
+void CContextModel::unregisterSSMResource(ActivationType activationType,
+        int targetDeviceDataId, ISSMResource *pSSMResource)
 {
     intptr_t     *pData = NULL;
 
@@ -177,8 +177,8 @@ void CContextModel::unregisterSSMResource(IN ActivationType activationType,
     m_mtxActivationCount.unlock();
 }
 
-SSMRESULT CContextModel::create(IN ConstructionType constructionType,
-                                IN IContextModel *pParentModel, IN std::string modelName, IN ModelPropertyVec *pModelProperties)
+SSMRESULT CContextModel::create(ConstructionType constructionType,
+                                IContextModel *pParentModel, std::string modelName, ModelPropertyVec *pModelProperties)
 {
     SSMRESULT res = SSM_E_FAIL;
     int         modelId = 1;
@@ -205,13 +205,13 @@ CLEANUP:
     return res;
 }
 
-SSMRESULT CContextModel::registerContextModelEvent(IN IContextModelEvent *pContextModelEvent)
+SSMRESULT CContextModel::registerContextModelEvent(IContextModelEvent *pContextModelEvent)
 {
     m_pContextModelEvent = pContextModelEvent;
     return SSM_S_OK;
 }
 
-void CContextModel::onExecute(IN void *pArg)
+void CContextModel::onExecute(void *pArg)
 {
     intptr_t *pData = (intptr_t *)pArg;
 
@@ -221,15 +221,15 @@ void CContextModel::onExecute(IN void *pArg)
     }
 }
 
-void CContextModel::onTerminate(IN void *pArg)
+void CContextModel::onTerminate(void *pArg)
 {
     intptr_t *pData = (intptr_t *)pArg;
     SAFE_ARRAY_DELETE(pData);
 }
 
 //TODO: called when new data arrived
-int CContextModel::onEvent(IN std::string deviceID, IN TypeofEvent callType,
-                           IN std::vector<ContextData> ctxData)
+int CContextModel::onEvent(std::string deviceID, TypeofEvent callType,
+                           std::vector<ContextData> ctxData)
 {
     SSMRESULT           res = SSM_E_FAIL;
     int                 dataId = 0;
@@ -337,21 +337,21 @@ IContextModel::ConstructionType CContextModel::getConstructionType()
     return m_constructionType;
 }
 
-SSMRESULT CContextModel::getParentDataId(IN int dataId, IN IContextModel *pParentModel,
-        OUT int *pParentDataId)
+SSMRESULT CContextModel::getParentDataId(int dataId, IContextModel *pParentModel,
+        int *pParentDataId)
 {
     return m_pEvaluationEngine->getParentDataId(m_modelId, dataId, pParentModel->getModelId(),
             pParentDataId);
 }
 
-SSMRESULT CContextModel::getChildDataId(IN int dataId, IN IContextModel *pChildModel,
-                                        OUT IntVec *pChildDataIds)
+SSMRESULT CContextModel::getChildDataId(int dataId, IContextModel *pChildModel,
+                                        IntVec *pChildDataIds)
 {
     return m_pEvaluationEngine->getChildDataId(m_modelId, dataId, pChildModel->getModelId(),
             pChildDataIds);
 }
 
-SSMRESULT CContextModel::activate(IN ActivationType activationType, IN int targetDeviceDataId)
+SSMRESULT CContextModel::activate(ActivationType activationType, int targetDeviceDataId)
 {
     if (targetDeviceDataId < 0 && activationType == ACTIVATION_TYPE_SUBSCRIBE)
     {
@@ -377,7 +377,7 @@ SSMRESULT CContextModel::activate(IN ActivationType activationType, IN int targe
     return SSM_S_OK;
 }
 
-SSMRESULT CContextModel::deactivate(IN ActivationType activationType, IN int targetDeviceDataId)
+SSMRESULT CContextModel::deactivate(ActivationType activationType, int targetDeviceDataId)
 {
     if (targetDeviceDataId < 0 && activationType == ACTIVATION_TYPE_SUBSCRIBE)
     {
@@ -403,29 +403,29 @@ SSMRESULT CContextModel::deactivate(IN ActivationType activationType, IN int tar
     return SSM_S_OK;
 }
 /*
-SSMRESULT CContextModel::GetModelSchema(OUT ModelPropertyVec *pModelProperties)
+SSMRESULT CContextModel::GetModelSchema(ModelPropertyVec *pModelProperties)
 {
     return m_pEvaluationEngine->GetModelSchema(m_ModelId, pModelProperties);
 }
 */
-SSMRESULT CContextModel::addModelData(IN int parentDataId, IN ModelPropertyVec *pData,
-                                      OUT int *pDataId)
+SSMRESULT CContextModel::addModelData(int parentDataId, ModelPropertyVec *pData,
+                                      int *pDataId)
 {
     return m_pEvaluationEngine->addModelData(m_modelId, m_pParentModel->getModelId(), parentDataId,
             pData, pDataId);
 }
 
-SSMRESULT CContextModel::updateModelData(IN int dataId, IN ModelPropertyVec *pData)
+SSMRESULT CContextModel::updateModelData(int dataId, ModelPropertyVec *pData)
 {
     return m_pEvaluationEngine->updateModelData(m_modelId, dataId, pData);
 }
 
-SSMRESULT CContextModel::deleteModelData(IN int dataId)
+SSMRESULT CContextModel::deleteModelData(int dataId)
 {
     return m_pEvaluationEngine->deleteModelData(m_modelId, dataId);
 }
 
-SSMRESULT CContextModel::getModelData(IN int dataId, OUT ModelPropertyVec *pData)
+SSMRESULT CContextModel::getModelData(int dataId, ModelPropertyVec *pData)
 {
     SSMRESULT res = SSM_E_FAIL;
     int     i = 0;
@@ -440,8 +440,8 @@ CLEANUP:
     return res;
 }
 
-SSMRESULT CContextModel::getModelDataSet(IN int startIndex, IN int count,
-        OUT std::vector<ModelPropertyVec> *pDataSet, OUT int *pLastIndex)
+SSMRESULT CContextModel::getModelDataSet(int startIndex, int count,
+        std::vector<ModelPropertyVec> *pDataSet, int *pLastIndex)
 {
     SSMRESULT res = SSM_E_FAIL;
     int     i;
@@ -464,8 +464,8 @@ CLEANUP:
     return res;
 }
 
-SSMRESULT CContextModel::createConditionedModel(IN ModelConditionVec *pModelConditionVec,
-        OUT IConditionedModel **ppConditionedModel)
+SSMRESULT CContextModel::createConditionedModel(ModelConditionVec *pModelConditionVec,
+        IConditionedModel **ppConditionedModel)
 {
     SSMRESULT res = SSM_E_FAIL;
     CObject<CConditionedModel>                  *pConditionedModel;
@@ -501,8 +501,8 @@ CLEANUP:
 */
 
 //Called new install or re install
-void CContextModel::addSSMResourceAndDeviceDataId(IN std::string deviceId, IN int deviceDataId,
-        IN ISSMResource *pSSMResource)
+void CContextModel::addSSMResourceAndDeviceDataId(std::string deviceId, int deviceDataId,
+        ISSMResource *pSSMResource)
 {
     if (deviceDataId == 1)
     {