Index: trunk/lib/FlairSensorActuator/src/BlCtrlV2_x4_speed.cpp
===================================================================
--- trunk/lib/FlairSensorActuator/src/BlCtrlV2_x4_speed.cpp	(revision 309)
+++ trunk/lib/FlairSensorActuator/src/BlCtrlV2_x4_speed.cpp	(revision 318)
@@ -122,5 +122,5 @@
   input = new Matrix((IODevice *)this, 8, 1, floatType);
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(4, 2);
+  MatrixDescriptor *desc = new MatrixDescriptor(4, 2);
   desc->SetElementName(0, 0, "avant gauche");
   desc->SetElementName(1, 0, "arriere droite");
Index: trunk/lib/FlairSensorActuator/src/Bldc.cpp
===================================================================
--- trunk/lib/FlairSensorActuator/src/Bldc.cpp	(revision 309)
+++ trunk/lib/FlairSensorActuator/src/Bldc.cpp	(revision 318)
@@ -43,5 +43,5 @@
   pimpl_ = new Bldc_impl(this, layout, name, motors_count);
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(motors_count, 2);
+  MatrixDescriptor *desc = new MatrixDescriptor(motors_count, 2);
   for (int i = 0; i < motors_count; i++) {
     ostringstream speed, current;
Index: trunk/lib/FlairSensorActuator/src/HokuyoUTM30Lx.cpp
===================================================================
--- trunk/lib/FlairSensorActuator/src/HokuyoUTM30Lx.cpp	(revision 309)
+++ trunk/lib/FlairSensorActuator/src/HokuyoUTM30Lx.cpp	(revision 318)
@@ -39,5 +39,5 @@
     : LaserRangeFinder(name), Thread(getFrameworkManager(), name, priority) {
   main_tab = new Tab(getFrameworkManager()->GetTabWidget(), name);
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(1081, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(1081, 1);
   output = new Matrix((IODevice *)this, desc, SignedIntegerType(16));
   delete desc;
Index: trunk/lib/FlairSensorActuator/src/LaserRangeFinder.cpp
===================================================================
--- trunk/lib/FlairSensorActuator/src/LaserRangeFinder.cpp	(revision 309)
+++ trunk/lib/FlairSensorActuator/src/LaserRangeFinder.cpp	(revision 318)
@@ -37,5 +37,5 @@
 LaserRangeFinder::LaserRangeFinder(string name)
     : IODevice(getFrameworkManager(), name) {
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(360, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(360, 1);
   output = new Matrix(this, desc, floatType);
   delete desc;
Index: trunk/lib/FlairSensorActuator/src/PressureSensor.cpp
===================================================================
--- trunk/lib/FlairSensorActuator/src/PressureSensor.cpp	(revision 309)
+++ trunk/lib/FlairSensorActuator/src/PressureSensor.cpp	(revision 318)
@@ -36,5 +36,5 @@
   plot_tab = NULL;
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
   desc->SetElementName(0, 0, name);
   output = new Matrix(this, desc, floatType);
Index: trunk/lib/FlairSensorActuator/src/RadioReceiver.cpp
===================================================================
--- trunk/lib/FlairSensorActuator/src/RadioReceiver.cpp	(revision 309)
+++ trunk/lib/FlairSensorActuator/src/RadioReceiver.cpp	(revision 318)
@@ -38,5 +38,5 @@
 
   // init matrix
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(nb_channels, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(nb_channels, 1);
   for (int i = 0; i < nb_channels; i++) {
     ostringstream channel_name;
Index: trunk/lib/FlairSensorActuator/src/UsRangeFinder.cpp
===================================================================
--- trunk/lib/FlairSensorActuator/src/UsRangeFinder.cpp	(revision 309)
+++ trunk/lib/FlairSensorActuator/src/UsRangeFinder.cpp	(revision 318)
@@ -36,5 +36,5 @@
   plot_tab = NULL;
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
   desc->SetElementName(0, 0, name);
   output = new Matrix(this, desc, floatType);
Index: trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp
===================================================================
--- trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp	(revision 309)
+++ trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp	(revision 318)
@@ -59,5 +59,5 @@
   
   // state
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(7, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(7, 1);
   desc->SetElementName(0, 0, "q0");
   desc->SetElementName(1, 0, "q1");
@@ -70,5 +70,5 @@
   delete desc;
 
-  desc = new cvmatrix_descriptor(3, 1);
+  desc = new MatrixDescriptor(3, 1);
   desc->SetElementName(0, 0, "roll");
   desc->SetElementName(1, 0, "pitch");
