start DBus signal and method names with lower case letters to conform with https://collab.genivi.org/wiki/display/genivi/Franca+IDL+Usage+GuidelinesdbusAdaptToNamingConvention

13 files changed, 56 insertions, 56 deletions

diff --git a/enhanced-position-service/api/genivi-positioning-configuration.xml b/enhanced-position-service/api/genivi-positioning-configuration.xml
index 8ebedd3..c300f10 100644
--- a/enhanced-position-service/api/genivi-positioning-configuration.xml
+++ b/enhanced-position-service/api/genivi-positioning-configuration.xml
@@ -20,9 +20,9 @@
       <line>Configuration = This interface allows a client application to set and retrieve configuration options</line>

     </doc>

    

-    <method name="GetVersion">

+    <method name="getVersion">

       <doc>

-        <line>GetVersion = This method returns the API version implemented by the server application.</line>

+        <line>getVersion = This method returns the API version implemented by the server application.</line>

       </doc>

       <arg name="version" type="(qqqs)" direction="out">

         <doc>

@@ -35,16 +35,16 @@
       </arg>

     </method>

 

-    <method name="GetProperties">

+    <method name="getProperties">

       <doc>

-        <line>GetProperties = This method returns all global system properties.</line>

+        <line>getProperties = This method returns all global system properties.</line>

       </doc>

       <arg name="properties" type="a{sv}" direction="out" />

     </method>

 

-    <method name="SetProperty">

+    <method name="setProperty">

       <doc>

-        <line>SetProperty = This method changes the value of the specified property</line>

+        <line>setProperty = This method changes the value of the specified property</line>

         <line>Only properties that are listed as read-write are changeable</line>

         <line>On success a PropertyChanged signal will be emitted</line>

       </doc>

@@ -61,9 +61,9 @@
       <error name="org.genivi.positioning.Configuration.Error.InvalidProperty" />

     </method>

 

-    <signal name="PropertyChanged">

+    <signal name="propertyChanged">

       <doc>

-        <line>PropertyChanged = This signal is emitted when a property changes</line>

+        <line>propertyChanged = This signal is emitted when a property changes</line>

       </doc>

       <arg name="name" type="s">

         <doc>

@@ -77,21 +77,21 @@
       </arg>

     </signal>

 

-    <property name="SatelliteSystem" type="q" access="readwrite">

+    <property name="satelliteSystem" type="q" access="readwrite">

       <doc>

-        <line>SatelliteSystem = enum(INVALID,GPS,GLONASS,GALILEO,COMPASS, ... )</line>

+        <line>satelliteSystem = enum(INVALID,GPS,GLONASS,GALILEO,COMPASS, ... )</line>

       </doc>

     </property>

 

-    <property name="UpdateInterval" type="i" access="readwrite">

+    <property name="updateInterval" type="i" access="readwrite">

       <doc>

-        <line>UpdateInterval = update interval in ms</line>

+        <line>updateInterval = update interval in ms</line>

       </doc>

     </property>

 

-    <method name="GetSupportedProperties">

+    <method name="getSupportedProperties">

       <doc>

-        <line>GetSupportedProperties = This method returns all suppported global system properties</line>

+        <line>getSupportedProperties = This method returns all suppported global system properties</line>

       </doc>

       <arg name="properties" type="a{sv}" direction="out">

         <doc>

diff --git a/enhanced-position-service/api/genivi-positioning-enhancedposition.xml b/enhanced-position-service/api/genivi-positioning-enhancedposition.xml
index d43a987..553e35d 100644
--- a/enhanced-position-service/api/genivi-positioning-enhancedposition.xml
+++ b/enhanced-position-service/api/genivi-positioning-enhancedposition.xml
@@ -20,9 +20,9 @@
       <line>EnhancedPosition = This interface offers functionalities to retrieve the enhanced position of the vehicle</line>
     </doc>
 
-    <method name="GetVersion">
+    <method name="getVersion">
       <doc>
-        <line>GetVersion = This method returns the API version implemented by the server application</line>
+        <line>getVersion = This method returns the API version implemented by the server application</line>
       </doc>
       <arg name="version" type="(qqqs)" direction="out">
         <doc>
@@ -35,9 +35,9 @@
       </arg>
     </method>
 
-    <method name="GetPositionInfo">
+    <method name="getPositionInfo">
       <doc>
-        <line>GetPositionInfo = This method returns a given set of positioning data (e.g. Position, Course, Accuracy, Status, ... )</line>
+        <line>getPositionInfo = This method returns a given set of positioning data (e.g. Position, Course, Accuracy, Status, ... )</line>
       </doc>
 
       <arg name="valuesToReturn" type="t" direction="in">
@@ -93,9 +93,9 @@
       </arg>
     </method>
 
-    <signal name="PositionUpdate">
+    <signal name="positionUpdate">
       <doc>
-        <line>PositionUpdate = This signal is called to notifiy a client application that updated positioning data is available. The update frequency is implementation specific. The maximum allowed frequency is 10Hz</line>
+        <line>positionUpdate = This signal is called to notifiy a client application that updated positioning data is available. The update frequency is implementation specific. The maximum allowed frequency is 10Hz</line>
       </doc>
       <arg name="changedValues" type="t">
         <doc>
@@ -112,9 +112,9 @@
       </arg>
     </signal>
 
-    <method name="GetSatelliteInfo">
+    <method name="getSatelliteInfo">
       <doc>
-        <line>GetSatelliteInfo = This method returns information about the current satellite constellation</line>
+        <line>getSatelliteInfo = This method returns information about the current satellite constellation</line>
       </doc>
       <arg name="timestamp" type="t" direction="out">
         <doc>
@@ -134,9 +134,9 @@
       </arg>
     </method>
 
-    <method name="GetTime">
+    <method name="getTime">
       <doc>
-        <line>GetTime = This method returns UTC time and date</line>
+        <line>getTime = This method returns UTC time and date</line>
       </doc>
       <arg name="timestamp" type="t" direction="out">
         <doc>
diff --git a/enhanced-position-service/api/genivi-positioning-positionfeedback.xml b/enhanced-position-service/api/genivi-positioning-positionfeedback.xml
index e66bf85..5c89b03 100644
--- a/enhanced-position-service/api/genivi-positioning-positionfeedback.xml
+++ b/enhanced-position-service/api/genivi-positioning-positionfeedback.xml
@@ -19,9 +19,9 @@
       <line>PositionFeedback = This interface allows the application implementing the map-matching algorithm to provide a position feedback to the EnahncedPositionService</line>

     </doc>

     

-    <method name="GetVersion">

+    <method name="getVersion">

       <doc>

-        <line>GetVersion = This method returns the API version implemented by the server application</line>

+        <line>getVersion = This method returns the API version implemented by the server application</line>

       </doc>

       <arg name="version" type="(qqqs)" direction="out">

         <doc>

@@ -34,9 +34,9 @@
       </arg>

     </method>

     

-   <method name="SetPositionFeedback">

+   <method name="setPositionFeedback">

       <doc>

-        <line>SetPositionFeedback = This method allows a client application to provide the EnhancedPositionService with a position feedback</line>

+        <line>setPositionFeedback = This method allows a client application to provide the EnhancedPositionService with a position feedback</line>

         <line>Note: This interface is typically used by the application that implements the map-matching algorithm</line>

         <line>Such application can hand over to the EnhancedPositionService an array of map-matched positions with different values of reliability</line>

       </doc>

diff --git a/enhanced-position-service/src/configuration.cpp b/enhanced-position-service/src/configuration.cpp
index 959c4aa..7163dbe 100644
--- a/enhanced-position-service/src/configuration.cpp
+++ b/enhanced-position-service/src/configuration.cpp
@@ -63,7 +63,7 @@ Configuration::~Configuration()
 {
 }
 
-::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > Configuration::GetVersion()
+::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > Configuration::getVersion()
 {
   ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > Version;
 
@@ -75,7 +75,7 @@ Configuration::~Configuration()
   return Version;
 }
     
-std::map< std::string, ::DBus::Variant > Configuration::GetProperties()
+std::map< std::string, ::DBus::Variant > Configuration::getProperties()
 {
   std::map< std::string, ::DBus::Variant > Properties;
 
@@ -85,12 +85,12 @@ std::map< std::string, ::DBus::Variant > Configuration::GetProperties()
   return Properties;
 }
 
-void Configuration::SetProperty(const std::string& name, const ::DBus::Variant& value)
+void Configuration::setProperty(const std::string& name, const ::DBus::Variant& value)
 {
   throw DBus::ErrorNotSupported("Method not supported yet");
 }
 
-std::map< std::string, ::DBus::Variant > Configuration::GetSupportedProperties()
+std::map< std::string, ::DBus::Variant > Configuration::getSupportedProperties()
 {
   std::map< std::string, ::DBus::Variant > SupportedProperties;
 
diff --git a/enhanced-position-service/src/configuration.h b/enhanced-position-service/src/configuration.h
index 78c319a..0a577e5 100644
--- a/enhanced-position-service/src/configuration.h
+++ b/enhanced-position-service/src/configuration.h
@@ -32,13 +32,13 @@ public:
 
   ~Configuration();
   
-  ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > GetVersion();
+  ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > getVersion();
     
-  std::map< std::string, ::DBus::Variant > GetProperties();
+  std::map< std::string, ::DBus::Variant > getProperties();
 
-  void SetProperty(const std::string& name, const ::DBus::Variant& value);
+  void setProperty(const std::string& name, const ::DBus::Variant& value);
 
-  std::map< std::string, ::DBus::Variant > GetSupportedProperties();
+  std::map< std::string, ::DBus::Variant > getSupportedProperties();
 
   void run();
 
diff --git a/enhanced-position-service/src/enhanced-position.cpp b/enhanced-position-service/src/enhanced-position.cpp
index 3c6cce7..1362146 100644
--- a/enhanced-position-service/src/enhanced-position.cpp
+++ b/enhanced-position-service/src/enhanced-position.cpp
@@ -69,7 +69,7 @@ EnhancedPosition::~EnhancedPosition()
     mpSelf = 0;
 }
 
-::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > EnhancedPosition::GetVersion()
+::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > EnhancedPosition::getVersion()
 {
   ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > Version;
 
@@ -83,7 +83,7 @@ EnhancedPosition::~EnhancedPosition()
 
 
 
-void EnhancedPosition::GetPositionInfo(const uint64_t& valuesToReturn, uint64_t& timestamp, std::map< uint64_t, ::DBus::Variant >& data)
+void EnhancedPosition::getPositionInfo(const uint64_t& valuesToReturn, uint64_t& timestamp, std::map< uint64_t, ::DBus::Variant >& data)
 {
   //std::map< uint64_t, ::DBus::Variant > Data;
 
@@ -152,12 +152,12 @@ void EnhancedPosition::GetPositionInfo(const uint64_t& valuesToReturn, uint64_t&
 
 
 
-void EnhancedPosition::GetSatelliteInfo(uint64_t& timestamp, std::vector< ::DBus::Struct< uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, bool > >& satelliteInfo)
+void EnhancedPosition::getSatelliteInfo(uint64_t& timestamp, std::vector< ::DBus::Struct< uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, bool > >& satelliteInfo)
 {
   throw DBus::ErrorNotSupported("Method not supported yet");
 }
 
-void EnhancedPosition::GetTime(uint64_t& timestamp, std::map< uint64_t, ::DBus::Variant >& time)
+void EnhancedPosition::getTime(uint64_t& timestamp, std::map< uint64_t, ::DBus::Variant >& time)
 {
   throw DBus::ErrorNotSupported("Method not supported yet");
 }
@@ -339,7 +339,7 @@ void EnhancedPosition::sigPositionUpdate(const TGNSSPosition position[], uint16_
   }
 
   //notify clients
-  mpSelf->PositionUpdate(changedValues);
+  mpSelf->positionUpdate(changedValues);
 
 }
 
diff --git a/enhanced-position-service/src/enhanced-position.h b/enhanced-position-service/src/enhanced-position.h
index 2561c53..3167330 100644
--- a/enhanced-position-service/src/enhanced-position.h
+++ b/enhanced-position-service/src/enhanced-position.h
@@ -35,11 +35,11 @@ public:
 
   ~EnhancedPosition();
 
-  ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > GetVersion();
+  ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > getVersion();
 
-  void GetPositionInfo(const uint64_t& valuesToReturn, uint64_t& timestamp, std::map< uint64_t, ::DBus::Variant >& data);
-  void GetSatelliteInfo(uint64_t& timestamp, std::vector< ::DBus::Struct< uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, bool > >& satelliteInfo);
-  void GetTime(uint64_t& timestamp, std::map< uint64_t, ::DBus::Variant >& time);
+  void getPositionInfo(const uint64_t& valuesToReturn, uint64_t& timestamp, std::map< uint64_t, ::DBus::Variant >& data);
+  void getSatelliteInfo(uint64_t& timestamp, std::vector< ::DBus::Struct< uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, bool > >& satelliteInfo);
+  void getTime(uint64_t& timestamp, std::map< uint64_t, ::DBus::Variant >& time);
 
   void run();
 
diff --git a/enhanced-position-service/src/position-feedback.cpp b/enhanced-position-service/src/position-feedback.cpp
index 0538c0c..f94ef7e 100644
--- a/enhanced-position-service/src/position-feedback.cpp
+++ b/enhanced-position-service/src/position-feedback.cpp
@@ -30,7 +30,7 @@ PositionFeedback::~PositionFeedback()
 {
 }
 
-::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > PositionFeedback::GetVersion()
+::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > PositionFeedback::getVersion()
 {
   ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > Version;
 
@@ -42,7 +42,7 @@ PositionFeedback::~PositionFeedback()
   return Version;
 }
 
-void PositionFeedback::SetPositionFeedback(const std::vector< std::map< uint64_t, ::DBus::Variant > >& feedback, const uint64_t& timestamp, const uint16_t& feedbackType)
+void PositionFeedback::setPositionFeedback(const std::vector< std::map< uint64_t, ::DBus::Variant > >& feedback, const uint64_t& timestamp, const uint16_t& feedbackType)
 {
   throw DBus::ErrorNotSupported("Method not supported yet");
 }
diff --git a/enhanced-position-service/src/position-feedback.h b/enhanced-position-service/src/position-feedback.h
index 59c0490..a8ecfa3 100644
--- a/enhanced-position-service/src/position-feedback.h
+++ b/enhanced-position-service/src/position-feedback.h
@@ -34,9 +34,9 @@ public:
 
   ~PositionFeedback();
 
-  ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > GetVersion();
+  ::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string > getVersion();
 
-  void SetPositionFeedback(const std::vector< std::map< uint64_t, ::DBus::Variant > >& feedback, const uint64_t& timestamp, const uint16_t& feedbackType);
+  void setPositionFeedback(const std::vector< std::map< uint64_t, ::DBus::Variant > >& feedback, const uint64_t& timestamp, const uint16_t& feedbackType);
   
   void run();
 
diff --git a/enhanced-position-service/test/enhanced-position-client.cpp b/enhanced-position-service/test/enhanced-position-client.cpp
index d60f003..aa1a9ba 100644
--- a/enhanced-position-service/test/enhanced-position-client.cpp
+++ b/enhanced-position-service/test/enhanced-position-client.cpp
@@ -34,7 +34,7 @@ EnhancedPositionClient::EnhancedPositionClient(DBus::Connection &connection, con
 {
 }
 
-void EnhancedPositionClient::PositionUpdate(const uint64_t& changedValues)
+void EnhancedPositionClient::positionUpdate(const uint64_t& changedValues)
 {
   LOG_INFO_MSG(gCtx,"Position Update");
   
@@ -42,7 +42,7 @@ void EnhancedPositionClient::PositionUpdate(const uint64_t& changedValues)
   uint64_t timestamp;
   std::map< uint64_t, ::DBus::Variant > posData;
     
-  GetPositionInfo(changedValues, timestamp, posData);
+  getPositionInfo(changedValues, timestamp, posData);
 
   if (changedValues & POS_LATITUDE)
   {
diff --git a/enhanced-position-service/test/enhanced-position-client.h b/enhanced-position-service/test/enhanced-position-client.h
index 5bbe0f1..c703589 100644
--- a/enhanced-position-service/test/enhanced-position-client.h
+++ b/enhanced-position-service/test/enhanced-position-client.h
@@ -30,7 +30,7 @@ public:
 
   EnhancedPositionClient(DBus::Connection &connection, const char *path, const char *name);
 
-  void PositionUpdate(const uint64_t& changedValues);
+  void positionUpdate(const uint64_t& changedValues);
 
 };
 
diff --git a/enhanced-position-service/test/test-scripts/test-enhanced-position-service-tk-gui.py b/enhanced-position-service/test/test-scripts/test-enhanced-position-service-tk-gui.py
index 6ef7fc0..8d01b16 100644
--- a/enhanced-position-service/test/test-scripts/test-enhanced-position-service-tk-gui.py
+++ b/enhanced-position-service/test/test-scripts/test-enhanced-position-service-tk-gui.py
@@ -96,7 +96,7 @@ def signalPositionUpdate(event):
     #print("signalPositionUpdate Event received by GUI thread")
     changedValues = commQueue.get()
     #print changedValues
-    position = enhanced_position_interface.GetPositionInfo(changedValues)
+    position = enhanced_position_interface.getPositionInfo(changedValues)
     timestamp = position[0]
     #print 'TIMESTAMP:' +str(timestamp)
     data = position[1]
@@ -166,7 +166,7 @@ enhanced_position_interface = dbus.Interface(enhanced_position, dbus_interface='
 #register the signal handler
 bus.add_signal_receiver(catchall_positioning_signals_handler, \
                         dbus_interface = "org.genivi.positioning.EnhancedPosition", \
-                        signal_name = "PositionUpdate")
+                        signal_name = "positionUpdate")
 #create the dbus loop (must be global so we can terminate it)
 gobject.timeout_add(100, dbus_timeout_periodic)
 dbus_loop = gobject.MainLoop()
diff --git a/enhanced-position-service/test/test-scripts/test-enhanced-position-service.py b/enhanced-position-service/test/test-scripts/test-enhanced-position-service.py
index ee784aa..65fc381 100755
--- a/enhanced-position-service/test/test-scripts/test-enhanced-position-service.py
+++ b/enhanced-position-service/test/test-scripts/test-enhanced-position-service.py
@@ -51,7 +51,7 @@ bus = dbus.SessionBus()
 #signal receiver
 def catchall_positioning_signals_handler(changedValues):
     print 'PositonUpdate'
-    position = enhanced_position_interface.GetPositionInfo(changedValues)
+    position = enhanced_position_interface.getPositionInfo(changedValues)
     timestamp = position[0]
     print 'TIMESTAMP:' +str(timestamp)
     data = position[1]
@@ -73,7 +73,7 @@ def catchall_positioning_signals_handler(changedValues):
 #add signal receiver
 bus.add_signal_receiver(catchall_positioning_signals_handler, \
                         dbus_interface = "org.genivi.positioning.EnhancedPosition", \
-                        signal_name = "PositionUpdate")
+                        signal_name = "positionUpdate")
 
 #timeout
 def timeout():