From 58c5b220c8002f8a39b5ab39b68acb8c197f85a5 Mon Sep 17 00:00:00 2001 From: lm Date: Fri, 10 Dec 2010 16:43:09 +0100 Subject: [PATCH] Fixed compile warnings --- src/comm/MAVLinkSimulationLink.cc | 10 +++++----- src/uas/PxQuadMAV.cc | 4 ++++ src/ui/linechart/LinechartWidget.cc | 2 -- src/ui/map3D/QOSGWidget.h | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/comm/MAVLinkSimulationLink.cc b/src/comm/MAVLinkSimulationLink.cc index 6d6ecf935..fb171c734 100644 --- a/src/comm/MAVLinkSimulationLink.cc +++ b/src/comm/MAVLinkSimulationLink.cc @@ -559,14 +559,14 @@ void MAVLinkSimulationLink::mainloop() // Send controller states - uint8_t attControl = 1; - uint8_t posXYControl = 1; - uint8_t posZControl = 0; - uint8_t posYawControl = 1; +// uint8_t attControl = 1; +// uint8_t posXYControl = 1; +// uint8_t posZControl = 0; +// uint8_t posYawControl = 1; uint8_t gpsLock = 2; uint8_t visLock = 3; - uint8_t posLock = qMax(gpsLock, visLock); + //uint8_t posLock = qMax(gpsLock, visLock); #ifdef MAVLINK_ENABLED_PIXHAWK messageSize = mavlink_msg_control_status_pack(systemId, componentId, &msg, posLock, visLock, gpsLock, attControl, posXYControl, posZControl, posYawControl); diff --git a/src/uas/PxQuadMAV.cc b/src/uas/PxQuadMAV.cc index 7f9a9125e..c609a9505 100644 --- a/src/uas/PxQuadMAV.cc +++ b/src/uas/PxQuadMAV.cc @@ -168,5 +168,9 @@ void PxQuadMAV::sendProcessCommand(int watchdogId, int processId, unsigned int c mavlink_message_t msg; mavlink_msg_watchdog_command_encode(mavlink->getSystemId(), mavlink->getComponentId(), &msg, &payload); sendMessage(msg); +#else + Q_UNUSED(watchdogId); + Q_UNUSED(processId); + Q_UNUSED(command); #endif } diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index 4b5cbd1ed..d3b17b279 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -352,8 +352,6 @@ QWidget* LinechartWidget::createCurveItem(QString curve) QLabel* label; QLabel* value; QLabel* mean; - QLabel* median; - form->setAutoFillBackground(false); horizontalLayout = new QHBoxLayout(form); horizontalLayout->setSpacing(5); diff --git a/src/ui/map3D/QOSGWidget.h b/src/ui/map3D/QOSGWidget.h index ebc2dee7f..224184466 100644 --- a/src/ui/map3D/QOSGWidget.h +++ b/src/ui/map3D/QOSGWidget.h @@ -123,7 +123,7 @@ public: getCamera()->setGraphicsContext(getGraphicsWindow()); } - virtual void paintEvent( QPaintEvent * event ) { frame(); } + virtual void paintEvent( QPaintEvent * event ) { Q_UNUSED(event); frame(); } protected: -- 2.22.0