[GT-3129] Replace POI handle with standard handles used in all other

domains 

2 files changed, 29 insertions, 29 deletions

diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp
index 2b7d62f..6fbde08 100644
--- a/src/poi-service/poi-server/main.cpp
+++ b/src/poi-service/poi-server/main.cpp
@@ -511,7 +511,7 @@ void poiContentAccessServer::SetLanguage(std::string LanguageCode, std::string C
     }
 }
 
-void poiContentAccessServer::SetPoiSearchHandle(uint8_t poiSearchHandle)
+void poiContentAccessServer::SetPoiSearchHandle(uint32_t poiSearchHandle)
 {
     m_poiSearchHandle =  poiSearchHandle;
 }
@@ -521,7 +521,7 @@ void poiContentAccessServer::ResetPoiSearchHandle()
     m_poiSearchHandle = INVALID_HANDLE;
 }
 
-void poiContentAccessServer::PoiSearchCanceled(uint8_t poiSearchHandle)
+void poiContentAccessServer::PoiSearchCanceled(uint32_t poiSearchHandle)
 {
     m_poiTable.clear();
     m_poiDetailsTable.clear();
@@ -989,7 +989,7 @@ std::vector< DBus_category::DBus_category_t > poiSearchServer::GetCategoriesDeta
     return (return_value);
 }
 
-uint8_t poiSearchServer::CreatePoiSearchHandle()
+uint32_t poiSearchServer::CreatePoiSearchHandle()
 {
     // the POC is limited to the management of one handle !
     if (m_poiSearchHandle != INVALID_HANDLE)
@@ -1005,7 +1005,7 @@ uint8_t poiSearchServer::CreatePoiSearchHandle()
     return (m_poiSearchHandle);
 }
 
-void poiSearchServer::DeletePoiSearchHandle(const uint8_t& poiSearchHandle)
+void poiSearchServer::DeletePoiSearchHandle(const uint32_t& poiSearchHandle)
 {
     cam_t cam;
     bool reply;
@@ -1025,7 +1025,7 @@ void poiSearchServer::DeletePoiSearchHandle(const uint8_t& poiSearchHandle)
     }
 }
 
-void poiSearchServer::SetRouteHandle(const uint8_t& poiSearchHandle, const uint8_t& sessionHandle, const uint8_t& routeHandle, const uint32_t& startSearchOffset, const uint32_t& endSearchOffset)
+void poiSearchServer::SetRouteHandle(const uint32_t& poiSearchHandle, const uint8_t& sessionHandle, const uint8_t& routeHandle, const uint32_t& startSearchOffset, const uint32_t& endSearchOffset)
 {
     uint32_t index;
     int16_t detailLevel;
@@ -1086,7 +1086,7 @@ void poiSearchServer::SetRouteHandle(const uint8_t& poiSearchHandle, const uint8
     }
 }
 
-void poiSearchServer::SetCategories(const uint8_t& poiSearchHandle, const std::vector< DBus_categoryRadius::DBus_categoryRadius_t >& poiCategories)
+void poiSearchServer::SetCategories(const uint32_t& poiSearchHandle, const std::vector< DBus_categoryRadius::DBus_categoryRadius_t >& poiCategories)
 {
     uint16_t index;
     uint16_t category_index;
@@ -1132,7 +1132,7 @@ void poiSearchServer::SetCategories(const uint8_t& poiSearchHandle, const std::v
     }
 }
 
-void poiSearchServer::SetAttributes(const uint8_t& poiSearchHandle, const std::vector< DBus_attributeDetails::DBus_attributeDetails_t >& poiAttributes)
+void poiSearchServer::SetAttributes(const uint32_t& poiSearchHandle, const std::vector< DBus_attributeDetails::DBus_attributeDetails_t >& poiAttributes)
 {
     DBus_attributeDetails attribDet;
     DBus_attributeDetails::attributeDetails_t attributeDetails;
@@ -1182,7 +1182,7 @@ void poiSearchServer::SetAttributes(const uint8_t& poiSearchHandle, const std::v
     }
 }
 
-void poiSearchServer::StartPoiSearch(const uint8_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption)
+void poiSearchServer::StartPoiSearch(const uint32_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption)
 {
 
     if ((m_poiSearchHandle == INVALID_HANDLE) || (poiSearchHandle != m_poiSearchHandle))
@@ -1208,7 +1208,7 @@ void poiSearchServer::StartPoiSearch(const uint8_t& poiSearchHandle, const std::
     }
 }
 
-void poiSearchServer::CancelPoiSearch(const uint8_t& poiSearchHandle)
+void poiSearchServer::CancelPoiSearch(const uint32_t& poiSearchHandle)
 {
     if ((m_poiSearchHandle == INVALID_HANDLE) || (poiSearchHandle != m_poiSearchHandle))
         // to do send an error message
@@ -1223,7 +1223,7 @@ void poiSearchServer::CancelPoiSearch(const uint8_t& poiSearchHandle)
     }
 }
 
-void poiSearchServer::SetCenter(const uint8_t& poiSearchHandle, const DBus_geoCoordinate3D::DBus_geoCoordinate3D_t& location)
+void poiSearchServer::SetCenter(const uint32_t& poiSearchHandle, const DBus_geoCoordinate3D::DBus_geoCoordinate3D_t& location)
 {
     DBus_geoCoordinate3D geoCoord;
 
@@ -1237,7 +1237,7 @@ void poiSearchServer::SetCenter(const uint8_t& poiSearchHandle, const DBus_geoCo
     }
 }
 
-void poiSearchServer::StartPoiProximityAlert(const uint8_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption)
+void poiSearchServer::StartPoiProximityAlert(const uint32_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption)
 {
     if ((m_poiSearchHandle == INVALID_HANDLE) || (poiSearchHandle != m_poiSearchHandle))
         // to do send an error message
@@ -1253,7 +1253,7 @@ void poiSearchServer::StartPoiProximityAlert(const uint8_t& poiSearchHandle, con
     }
 }
 
-void poiSearchServer::CancelPoiProximityAlert(const uint8_t& poiSearchHandle)
+void poiSearchServer::CancelPoiProximityAlert(const uint32_t& poiSearchHandle)
 {
     if ((m_poiSearchHandle == INVALID_HANDLE) || (poiSearchHandle != m_poiSearchHandle))
         // to do send an error message
@@ -1269,7 +1269,7 @@ void poiSearchServer::CancelPoiProximityAlert(const uint8_t& poiSearchHandle)
     }
 }
 
-void poiSearchServer::RequestResultList(const uint8_t& poiSearchHandle, const uint16_t& offset, const uint16_t& maxWindowSize, const std::vector< std::string >& attributes, uint16_t& statusValue, uint16_t& resultListSize, std::vector< DBus_searchResult::DBus_searchResult_t >& resultListWindow)
+void poiSearchServer::RequestResultList(const uint32_t& poiSearchHandle, const uint16_t& offset, const uint16_t& maxWindowSize, const std::vector< std::string >& attributes, uint16_t& statusValue, uint16_t& resultListSize, std::vector< DBus_searchResult::DBus_searchResult_t >& resultListWindow)
 {
     DBus_searchResult::searchResult_t element; //id distance status attributes[]
     DBus_searchResult el;
diff --git a/src/poi-service/poi-server/poi-server-class.h b/src/poi-service/poi-server/poi-server-class.h
index 53c4792..db0f1a7 100644
--- a/src/poi-service/poi-server/poi-server-class.h
+++ b/src/poi-service/poi-server/poi-server-class.h
@@ -156,11 +156,11 @@ public:
 
     uint16_t searchAroundALocation(DBus_geoCoordinate3D::geoCoordinate3D_t location,const std::string* inputString, uint16_t sortOption);
 
-    void SetPoiSearchHandle(uint8_t poiSearchHandle);
+    void SetPoiSearchHandle(uint32_t poiSearchHandle);
 
     void ResetPoiSearchHandle();
 
-    void PoiSearchCanceled(uint8_t poiSearchHandle);
+    void PoiSearchCanceled(uint32_t poiSearchHandle);
 
     DBus_poiCAMDetails::DBus_poiCAMDetails_t GetResultPoi(uint16_t index);
 
@@ -180,7 +180,7 @@ private:
 
     void sendDBusError(const char* message);
 
-    uint8_t m_poiSearchHandle; // the POC is limited to the management of one handle !
+    uint32_t m_poiSearchHandle; // the POC is limited to the management of one handle !
 
     contentAccessModule *mp_contentAccessModule;
     poiSearchServer *mp_poiSearch;
@@ -241,27 +241,27 @@ public:
 
     std::vector< DBus_category::DBus_category_t > GetCategoriesDetails(const std::vector< uint16_t >& categories);
 
-    uint8_t CreatePoiSearchHandle();
+    uint32_t CreatePoiSearchHandle();
 
-    void DeletePoiSearchHandle(const uint8_t& poiSearchHandle);
+    void DeletePoiSearchHandle(const uint32_t& poiSearchHandle);
 
-    void SetRouteHandle(const uint8_t& poiSearchHandle, const uint8_t& sessionHandle, const uint8_t& routeHandle, const uint32_t& startSearchOffset, const uint32_t& endSearchOffset);
+    void SetRouteHandle(const uint32_t& poiSearchHandle, const uint8_t& sessionHandle, const uint8_t& routeHandle, const uint32_t& startSearchOffset, const uint32_t& endSearchOffset);
 
-    void SetCategories(const uint8_t& poiSearchHandle, const std::vector< DBus_categoryRadius::DBus_categoryRadius_t >& poiCategories);
+    void SetCategories(const uint32_t& poiSearchHandle, const std::vector< DBus_categoryRadius::DBus_categoryRadius_t >& poiCategories);
 
-    void SetAttributes(const uint8_t& poiSearchHandle, const std::vector< DBus_attributeDetails::DBus_attributeDetails_t >& poiAttributes);
+    void SetAttributes(const uint32_t& poiSearchHandle, const std::vector< DBus_attributeDetails::DBus_attributeDetails_t >& poiAttributes);
 
-    void StartPoiSearch(const uint8_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption);
+    void StartPoiSearch(const uint32_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption);
 
-    void CancelPoiSearch(const uint8_t& poiSearchHandle);
+    void CancelPoiSearch(const uint32_t& poiSearchHandle);
 
-    void SetCenter(const uint8_t& poiSearchHandle, const DBus_geoCoordinate3D::DBus_geoCoordinate3D_t& location);
+    void SetCenter(const uint32_t& poiSearchHandle, const DBus_geoCoordinate3D::DBus_geoCoordinate3D_t& location);
 
-    void StartPoiProximityAlert(const uint8_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption);
+    void StartPoiProximityAlert(const uint32_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption);
 
-    void CancelPoiProximityAlert(const uint8_t& poiSearchHandle);
+    void CancelPoiProximityAlert(const uint32_t& poiSearchHandle);
 
-    void RequestResultList(const uint8_t& poiSearchHandle, const uint16_t& offset, const uint16_t& maxWindowSize, const std::vector< std::string >& attributes, uint16_t& statusValue, uint16_t& resultListSize, std::vector< DBus_searchResult::DBus_searchResult_t >& resultListWindow);
+    void RequestResultList(const uint32_t& poiSearchHandle, const uint16_t& offset, const uint16_t& maxWindowSize, const std::vector< std::string >& attributes, uint16_t& statusValue, uint16_t& resultListSize, std::vector< DBus_searchResult::DBus_searchResult_t >& resultListWindow);
 
     std::vector< DBus_searchResultDetails::DBus_searchResultDetails_t > GetPoiDetails(const std::vector< uint32_t >& id);
 
@@ -307,10 +307,10 @@ private:
 // DBus data
     DBus_version m_version;
     std::string m_languageCode, m_countryCode;
-    uint8_t m_poiSearchHandle; // the POC is limited to the management of one handle !
+    uint32_t m_poiSearchHandle; // the POC is limited to the management of one handle !
     uint16_t m_rootCategory;
     uint8_t m_sessionHandle;
-    uint8_t m_routeHandle;
+    uint32_t m_routeHandle;
     uint16_t m_startSearchOffset;
     uint16_t m_endSearchOffset;
     ushort m_searchStatus;