summaryrefslogtreecommitdiffstats
path: root/app/dbus_client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'app/dbus_client.cpp')
-rw-r--r--app/dbus_client.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/app/dbus_client.cpp b/app/dbus_client.cpp
index 6b5b5fb..62dde46 100644
--- a/app/dbus_client.cpp
+++ b/app/dbus_client.cpp
@@ -8,7 +8,7 @@ dbus_client::dbus_client(const QString &pathName,
m_pathName(pathName + serverName),
m_objName(objName + serverName)
{
- //DBus & api ini
+ // DBus & api init
initDBus();
initAPIs(parent);
}
@@ -19,7 +19,7 @@ void dbus_client::initDBus(){
new NaviapiAdaptor(this);
- //make a connect session to navigation service(add route info)
+ // connect session to navigation service(add route info)
if (!QDBusConnection::sessionBus().connect(
QString(),
QString(),
@@ -27,10 +27,10 @@ void dbus_client::initDBus(){
"signalRouteInfo",
this,
SLOT(addRoutePointsSlot(double, double, double, double)))) { //slot
- qDebug() << m_serverName << "sessionBus.connect(): signalRouteInfo failed";
+ qWarning() << m_serverName << "sessionBus.connect(): signalRouteInfo failed";
}
- //make a connect session to navigation service(current postion info)
+ // connect session to navigation service(current postion info)
if (!QDBusConnection::sessionBus().connect(
QString(),
QString(),
@@ -38,10 +38,10 @@ void dbus_client::initDBus(){
"signalPosInfo",
this,
SLOT(positionSlot(double, double, double, double)))) { //slot
- qDebug() << m_serverName << "sessionBus.connect(): signalPosInfo failed";
+ qWarning() << m_serverName << "sessionBus.connect(): signalPosInfo failed";
}
- //make a connect session to navigation service(when demo stopped)
+ // connect session to navigation service(when demo stopped)
if (!QDBusConnection::sessionBus().connect(
QString(),
QString(),
@@ -49,67 +49,67 @@ void dbus_client::initDBus(){
"signalStopDemo",
this,
SLOT(stopdemoSlot()))) { //slot
- qDebug() << m_serverName << "sessionBus.connect(): signalStopDemo failed";
+ qWarning() << m_serverName << "sessionBus.connect(): signalStopDemo failed";
}
- //make a connect session to navigation service(when arrived destination)
+ // connect session to navigation service(when arrived destination)
if (!QDBusConnection::sessionBus().connect(
QString(),
QString(),
m_pathName,
- "signalArrvied",
+ "signalArrived",
this,
SLOT(arrivedestSlot()))) { //slot
- qDebug() << m_serverName << "sessionBus.connect(): signalArrvied failed";
+ qWarning() << m_serverName << "sessionBus.connect(): signalArrived failed";
}
}
void dbus_client::initAPIs(QObject *parent){
- //connect the signal to qml inside function(addRoutePointsQml -> do_addRoutePoint)
+ // connect the signal to qml inside function(addRoutePointsQml -> do_addRoutePoint)
if(!QObject::connect(this, SIGNAL(addRoutePointsQml(QVariant, QVariant, QVariant, QVariant)),
parent, SLOT(do_addRoutePoint(QVariant, QVariant, QVariant, QVariant)))) {
- qDebug() << m_serverName << "SIGNAL:addRoutePointsQml to qmlSLOT:do_addRoutePoint connect is failed";
+ qWarning() << m_serverName << "SIGNAL:addRoutePointsQml to qmlSLOT:do_addRoutePoint connect failed";
}
- //connect the signal to qml inside function(positionQml -> do_setCoordinate)
+ // connect the signal to qml inside function(positionQml -> do_setCoordinate)
if(!QObject::connect(this, SIGNAL(positionQml(QVariant, QVariant,QVariant, QVariant)),
parent, SLOT(do_setCoordinate(QVariant, QVariant,QVariant, QVariant)))) {
- qDebug() << m_serverName << "SIGNAL:positionQml to qmlSLOT:do_setCoordinate connect is failed";
+ qWarning() << m_serverName << "SIGNAL:positionQml to qmlSLOT:do_setCoordinate connect failed";
}
- //connect the signal to qml inside function(stopdemoQml -> do_stopnavidemo)
+ // connect the signal to qml inside function(stopdemoQml -> do_stopnavidemo)
if(!QObject::connect(this, SIGNAL(stopdemoQml()),
parent, SLOT(do_stopnavidemo()))) {
- qDebug() << m_serverName << "SIGNAL:stopdemoQml to qmlSLOT:do_stopnavidemo connect is failed";
+ qWarning() << m_serverName << "SIGNAL:stopdemoQml to qmlSLOT:do_stopnavidemo connect failed";
}
- //connect the signal to qml inside function(arrivedestQml -> do_arrivedest)
+ // connect the signal to qml inside function(arrivedestQml -> do_arrivedest)
if(!QObject::connect(this, SIGNAL(arrivedestQml()),
parent, SLOT(do_arrivedest()))) {
- qDebug() << m_serverName << "SIGNAL:arrivedestQml to qmlSLOT:do_arrivedest connect is failed";
+ qWarning() << m_serverName << "SIGNAL:arrivedestQml to qmlSLOT:do_arrivedest connect failed";
}
}
-//Signal&&Method
-//addRoutePointsSlot -> addRoutePointsQml(use for qml)
+// Signal&&Method
+// addRoutePointsSlot -> addRoutePointsQml(use for qml)
void dbus_client::addRoutePointsSlot(double route_Lat_s, double route_Lon_s, double route_Lat_e, double route_Lon_e)
{
emit addRoutePointsQml(route_Lat_s, route_Lon_s, route_Lat_e, route_Lon_e);
}
-//positionSlot -> positionQml(use for qml)
+// positionSlot -> positionQml(use for qml)
void dbus_client::positionSlot(double cur_Lat_p, double cur_Lon_p,double cur_direction, double cur_distance)
{
emit positionQml(cur_Lat_p, cur_Lon_p,cur_direction,cur_distance);
}
-//stopdemoSlot -> stopdemoQml(use for qml)
+// stopdemoSlot -> stopdemoQml(use for qml)
void dbus_client::stopdemoSlot()
{
emit stopdemoQml();
}
-//arrivedestSlot -> arrivedestQml(use for qml)
+// arrivedestSlot -> arrivedestQml(use for qml)
void dbus_client::arrivedestSlot()
{
emit arrivedestQml();