From 47c4bcfd2165c7adb0184950c97c0a0801677912 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Thu, 25 Oct 2012 16:06:45 +0200 Subject: [PATCH] Fix stupid compile error --- src/uas/QGCUASParamManager.h | 2 +- src/ui/QGCParamWidget.h | 2 +- src/ui/RadioCalibration/RadioCalibrationWindow.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/uas/QGCUASParamManager.h b/src/uas/QGCUASParamManager.h index 5155db528..069edc8a8 100644 --- a/src/uas/QGCUASParamManager.h +++ b/src/uas/QGCUASParamManager.h @@ -42,7 +42,7 @@ public: virtual double getParamMin(const QString& param) = 0; virtual double getParamMax(const QString& param) = 0; virtual double getParamDefault(const QString& param) = 0; - virtual const QString& getParamInfo(const QString& param) = 0; + virtual QString getParamInfo(const QString& param) = 0; /** @brief Request an update for the parameter list */ void requestParameterListUpdate(int component = 0); diff --git a/src/ui/QGCParamWidget.h b/src/ui/QGCParamWidget.h index 013c81335..8dc801e57 100644 --- a/src/ui/QGCParamWidget.h +++ b/src/ui/QGCParamWidget.h @@ -57,7 +57,7 @@ public: double getParamMin(const QString& param) { return paramMin.value(param, 0.0f); } double getParamMax(const QString& param) { return paramMax.value(param, 0.0f); } double getParamDefault(const QString& param) { return paramDefault.value(param, 0.0f); } - const QString& getParamInfo(const QString& param) { return paramToolTips.value(param, ""); } + QString getParamInfo(const QString& param) { return paramToolTips.value(param, ""); } signals: /** @brief A parameter was changed in the widget, NOT onboard */ diff --git a/src/ui/RadioCalibration/RadioCalibrationWindow.h b/src/ui/RadioCalibration/RadioCalibrationWindow.h index 855540132..536a4993c 100644 --- a/src/ui/RadioCalibration/RadioCalibrationWindow.h +++ b/src/ui/RadioCalibration/RadioCalibrationWindow.h @@ -50,8 +50,6 @@ This file is part of the QGROUNDCONTROL project #include "SwitchCalibrator.h" #include "CurveCalibrator.h" -#include "../../../mavlink/include/mavlink/v1.0/common/mavlink.h" -#include "../../../mavlink/include/mavlink/v1.0/mavlink_types.h" #include "UAS.h" #include "UASManager.h" #include "RadioCalibrationData.h" -- 2.22.0