summaryrefslogtreecommitdiff
path: root/src/poi-service
diff options
context:
space:
mode:
authorasanoaozora <fifitaneki@hotmail.com>2017-02-13 10:41:46 +0100
committerasanoaozora <fifitaneki@hotmail.com>2017-02-13 10:41:46 +0100
commitf1c45529460d5bea078d748352cc7925d23695cf (patch)
treec671dfa17fbfe3544cfda2d8374b910071cb1585 /src/poi-service
parentbf405aa8d082d39784723c8aac71e9e97e32ee85 (diff)
downloadpoi-service-f1c45529460d5bea078d748352cc7925d23695cf.tar.gz
fix errors in poi-server and test script
Diffstat (limited to 'src/poi-service')
-rw-r--r--src/poi-service/poi-server/main.cpp10
-rw-r--r--src/poi-service/poi-server/poi-server-class.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp
index a2b06a4..50bb074 100644
--- a/src/poi-service/poi-server/main.cpp
+++ b/src/poi-service/poi-server/main.cpp
@@ -43,14 +43,14 @@
#include "poi-server-class.h"
-static const char* poiSearch_SERVICE_NAME = "org.genivi.poiservice.POISearch";
+static const char* poiSearch_SERVICE_NAME = "org.genivi.navigation.poiservice.POISearch";
static const char* poiSearch_OBJECT_PATH = "/org/genivi/poiservice/POISearch";
-static const char* poiConfiguration_SERVICE_NAME = "org.genivi.poiservice.Configuration";
-static const char* poiConfiguration_OBJECT_PATH = "/org/genivi/poiservice/Configuration";
-static const char* poiContentAccess_SERVICE_NAME = "org.genivi.poiservice.POIContentAccess";
+static const char* poiConfiguration_SERVICE_NAME = "org.genivi.navigation.poiservice.POIConfiguration";
+static const char* poiConfiguration_OBJECT_PATH = "/org/genivi/poiservice/POIConfiguration";
+static const char* poiContentAccess_SERVICE_NAME = "org.genivi.navigation.poiservice.POIContentAccess";
static const char* poiContentAccess_OBJECT_PATH = "/org/genivi/poiservice/POIContentAccess";
static const char* contentAccessModule_OBJECT_PATH = "/org/genivi/poiservice/POIContentAccessModule";
-static const char* Routing_SERVICE_NAME = "org.genivi.navigationcore.Routing";
+static const char* Routing_SERVICE_NAME = "org.genivi.navigation.navigationcore.Routing";
static const char* Routing_OBJECT_PATH = "/org/genivi/navigationcore";
// SQL requests
diff --git a/src/poi-service/poi-server/poi-server-class.h b/src/poi-service/poi-server/poi-server-class.h
index f8b8cc4..3f90a00 100644
--- a/src/poi-service/poi-server/poi-server-class.h
+++ b/src/poi-service/poi-server/poi-server-class.h
@@ -62,7 +62,7 @@ class poiSearchServer;
class poiContentAccessServer;
class Routing
-: public org::genivi::navigationcore::Routing_proxy,
+: public org::genivi::navigation::navigationcore::Routing_proxy,
public DBus::IntrospectableProxy,
public DBus::ObjectProxy
{
@@ -87,7 +87,7 @@ class Routing
};
class contentAccessModule
-: public org::genivi::poiservice::POIContentAccessModule_proxy,
+: public org::genivi::navigation::poiservice::POIContentAccessModule_proxy,
public DBus::IntrospectableProxy,
public DBus::ObjectProxy
{
@@ -109,7 +109,7 @@ private:
};
class poiContentAccessServer
-: public org::genivi::poiservice::POIContentAccess_adaptor,
+: public org::genivi::navigation::poiservice::POIContentAccess_adaptor,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor
{
@@ -208,7 +208,7 @@ private:
};
class poiSearchServer
-: public org::genivi::poiservice::POISearch_adaptor,
+: public org::genivi::navigation::poiservice::POISearch_adaptor,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor
{
@@ -351,7 +351,7 @@ private:
};
class poiConfigurationServer
-: public org::genivi::poiservice::Configuration_adaptor,
+: public org::genivi::navigation::poiservice::POIConfiguration_adaptor,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor
{