Changeset 99 in pacpussensors for trunk/Wifibot/wifibot.cpp

Timestamp:

Oct 15, 2015, 2:47:01 PM (9 years ago)

Author:

nguyenhu

Message:

compilation under linux with 0.2.X framework

File:

• trunk/Wifibot/wifibot.cpp (modified) (5 diffs)

trunk/Wifibot/wifibot.cpp

@@ -5 +5 @@
 //  author:     Pierre Hudelaine
 //              Copyright Heudiasyc UMR UTC/CNRS 7253
-// 
+//
 //  version:    $Id: $
 //
@@ -22 +22 @@
 // Construct the factory
 //////////////////////////////////////////////////////////////////////////
-static ComponentFactory <Wifibot> sFactory("Wifibot");  
+static ComponentFactory <Wifibot> sFactory("Wifibot");
 
 //////////////////////////////////////////////////////////////////////////
@@ -28 +28 @@
 //////////////////////////////////////////////////////////////////////////
 Wifibot::Wifibot(QString name)
-    : ComponentBase( name ) 
+    : ComponentBase( name )
 {
-  
-} 
+
+}
 
 
@@ -37 +37 @@
 // Destructor
 //////////////////////////////////////////////////////////////////////////
-Wifibot::~Wifibot() 
+Wifibot::~Wifibot()
 {
-  
+
 }
 
 //////////////////////////////////////////////////////////////////////////
-// Called by the ComponentManager to pass the XML parameters to the 
-// component 
+// Called by the ComponentManager to pass the XML parameters to the
+// component
 //////////////////////////////////////////////////////////////////////////
-ComponentBase::COMPONENT_CONFIGURATION  Wifibot::configureComponent( XmlComponentConfig config ) 
-{ 
+ComponentBase::COMPONENT_CONFIGURATION  Wifibot::configureComponent( XmlComponentConfig config )
+{
     QString pacpusSocket = config.getProperty("socketComponent");
-    ComponentManager * mgr = ComponentManager::getInstance();
-    pacpusSocket_ = dynamic_cast<PacpusSocket *>(mgr->getComponent(pacpusSocket));
+    //ComponentManager * mgr = ComponentManager::getInstance();
+    pacpusSocket_ = dynamic_cast<PacpusUDPSocket *>(ComponentManager::getInstance()->getComponent(pacpusSocket).get());
     if (!pacpusSocket_) {
             qWarning() << "Failed to get component " << pacpusSocket;
             return ComponentBase::NOT_CONFIGURED;
     }
-  
-    return ComponentBase::CONFIGURED_OK; 
-} 
+
+    return ComponentBase::CONFIGURED_OK;
+}
 
 
@@ -64 +64 @@
 // Called by the ComponentManager to start the component
 //////////////////////////////////////////////////////////////////////////
-void Wifibot::startActivity() 
-{ 
+void Wifibot::startActivity()
+{
     dualshock = new PS3remote(pacpusSocket_);
     dualshock->start();