fixed up some dbus types

diff --git a/plugins/dbus/environmentproperties.h b/plugins/dbus/environmentproperties.h
index 6f64c65..b510c0a 100644 (file)
--- a/plugins/dbus/environmentproperties.h
+++ b/plugins/dbus/environmentproperties.h
@@ -12,7 +12,7 @@ public:
        ExteriorBrightnessProperty(AbstractRoutingEngine* re, GDBusConnection* connection)
                :DBusSink("org.automotive.ExteriorBrightness","/org/automotive/environment/ExteriorBrightness", re, connection, map<string, string>())
        {
-               wantProperty<uint16_t>(VehicleProperty::ExteriorBrightness,"ExteriorBrightness", "y", AbstractProperty::Read);
+               wantProperty<uint16_t>(VehicleProperty::ExteriorBrightness,"ExteriorBrightness", "q", AbstractProperty::Read);
                supportedChanged(re->supported());
        }
 };

diff --git a/plugins/dbus/runningstatus.h b/plugins/dbus/runningstatus.h
index d6dec57..e48c7b4 100644 (file)
--- a/plugins/dbus/runningstatus.h
+++ b/plugins/dbus/runningstatus.h
@@ -354,7 +354,7 @@ public:
                 *  @type unsigned short
                 *  @access readonly
                 **/
-               wantProperty<uint16_t>(VehicleProperty::EngineOilRemaining, "Remaining", "y", AbstractProperty::Read);
+               wantProperty<uint16_t>(VehicleProperty::EngineOilRemaining, "Remaining", "q", AbstractProperty::Read);
 
                /** @attributeName Temperature
                 *  @type long
@@ -366,7 +366,7 @@ public:
                 *  @type unsigned short
                 *  @access readonly
                 **/
-               wantProperty<uint16_t>(VehicleProperty::EngineOilPressure, "Pressure", "y", AbstractProperty::Read);
+               wantProperty<uint16_t>(VehicleProperty::EngineOilPressure, "Pressure", "q", AbstractProperty::Read);
                supportedChanged(re->supported());
        }
 };
@@ -400,7 +400,7 @@ public:
                 *  @type unsigned short
                 *  @access readonly
                 **/
-               wantProperty<uint16_t>(VehicleProperty::Direction, "Direction", "y", AbstractProperty::Read);
+               wantProperty<uint16_t>(VehicleProperty::Direction, "Direction", "q", AbstractProperty::Read);
                supportedChanged(re->supported());
        }
 };

diff --git a/plugins/dbus/vehicleinfo.h b/plugins/dbus/vehicleinfo.h
index bfb198d..a596d6a 100644 (file)
--- a/plugins/dbus/vehicleinfo.h
+++ b/plugins/dbus/vehicleinfo.h
@@ -40,19 +40,19 @@ public:
                 *  @type unsigned long
                 *  @access readonly
                 **/
-               wantProperty<uint>(VehicleProperty::VehicleWidth, "Width", "i", AbstractProperty::Read);
+               wantProperty<uint>(VehicleProperty::VehicleWidth, "Width", "u", AbstractProperty::Read);
 
                /** @attributeName Height
                 *  @type unsigned long
                 *  @access readonly
                 **/
-               wantProperty<uint>(VehicleProperty::VehicleHeight, "Height", "i", AbstractProperty::Read);
+               wantProperty<uint>(VehicleProperty::VehicleHeight, "Height", "u", AbstractProperty::Read);
 
                /** @attributeName Length
                 *  @type unsigned long
                 *  @access readonly
                 **/
-               wantProperty<uint>(VehicleProperty::VehicleLength, "Length", "i", AbstractProperty::Read);
+               wantProperty<uint>(VehicleProperty::VehicleLength, "Length", "u", AbstractProperty::Read);
 
                supportedChanged(re->supported());
        }
@@ -75,7 +75,7 @@ public:
                 *  @type unsigned short
                 *  @access readonly
                 **/
-               wantProperty<Fuel::RefuelPosition>(VehicleProperty::FuelPositionSide, "RefuelPosition", "i", AbstractProperty::Read);
+               wantProperty<Fuel::RefuelPosition>(VehicleProperty::FuelPositionSide, "RefuelPosition", "y", AbstractProperty::Read);
 
                supportedChanged(re->supported());
        }
@@ -92,7 +92,7 @@ public:
                 *  @type unsigned short
                 *  @access readonly
                 **/
-               wantProperty<Vehicle::Type>(VehicleProperty::VehicleType, "Type", "i", AbstractProperty::Read);
+               wantProperty<Vehicle::Type>(VehicleProperty::VehicleType, "Type", "y", AbstractProperty::Read);
 
                supportedChanged(re->supported());
        }
@@ -126,7 +126,7 @@ public:
                 *  @type unsigned short
                 *  @access readonly
                 **/
-               wantProperty<Transmission::Type>(VehicleProperty::TransmissionGearType, "TransmissionGearType", "i", AbstractProperty::Read);
+               wantProperty<Transmission::Type>(VehicleProperty::TransmissionGearType, "TransmissionGearType", "y", AbstractProperty::Read);
 
                supportedChanged(re->supported());
        }
@@ -144,19 +144,19 @@ public:
                 *  @type unsigned short
                 *  @access readonly
                 **/
-               wantProperty<uint16_t>(VehicleProperty::FrontWheelRadius, "FrontWheelRadius", "i", AbstractProperty::Read);
+               wantProperty<uint16_t>(VehicleProperty::FrontWheelRadius, "FrontWheelRadius", "u", AbstractProperty::Read);
 
                /** @attributeName RearWheelRadius
                 *  @type unsigned short
                 *  @access readonly
                 **/
-               wantProperty<uint16_t>(VehicleProperty::RearWheelRadius, "RearWheelRadius", "i", AbstractProperty::Read);
+               wantProperty<uint16_t>(VehicleProperty::RearWheelRadius, "RearWheelRadius", "u", AbstractProperty::Read);
 
                /** @attributeName WheelTrack
                 *  @type unsigned long
                 *  @access readonly
                 **/
-               wantProperty<uint>(VehicleProperty::WheelTrack, "WheelTrack", "i", AbstractProperty::Read);
+               wantProperty<uint>(VehicleProperty::WheelTrack, "WheelTrack", "u", AbstractProperty::Read);
 
                supportedChanged(re->supported());
        }

diff --git a/plugins/opencvlux/CMakeLists.txt b/plugins/opencvlux/CMakeLists.txt
index dce3c45..37f306d 100644 (file)
--- a/plugins/opencvlux/CMakeLists.txt
+++ b/plugins/opencvlux/CMakeLists.txt
@@ -1,6 +1,6 @@
 if(opencvlux_plugin)
 
-FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
+FIND_PACKAGE(Qt4 COMPONENTS QtCore REQUIRED)
 include(${QT_USE_FILE})
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 

diff --git a/plugins/opencvlux/opencvluxplugin.h b/plugins/opencvlux/opencvluxplugin.h
index 781e602..afd178c 100644 (file)
--- a/plugins/opencvlux/opencvluxplugin.h
+++ b/plugins/opencvlux/opencvluxplugin.h
@@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <string>
 
 #include <QTimer>
-#include <QImage>
 #include <QList>
 #include <opencv/cv.h>
 #include <opencv/highgui.h>