Merge branch 'config' of github.com:mavlink/qgroundcontrol into config

src/ui/linechart/LinechartWidget.cc

@@ -673,9 +673,19 @@ void LinechartWidget::removeCurve(QString curve)
     widget = curveVariances->take(curve);
     curvesWidgetLayout->removeWidget(widget);
     widget->deleteLater();
-//    widget = colorIcons->take(curve);
-//    curvesWidgetLayout->removeWidget(colorIcons->take(curve));
+    widget = colorIcons.take(curve);
+    curvesWidgetLayout->removeWidget(widget);
+    widget->deleteLater();
+    widget = curveNameLabels.take(curve);
+    curvesWidgetLayout->removeWidget(widget);
+    widget->deleteLater();
+    widget = curveUnits.take(curve);
+    curvesWidgetLayout->removeWidget(widget);
     widget->deleteLater();
+    QCheckBox* checkbox;
+    checkbox = checkBoxes.take(curve);
+    curvesWidgetLayout->removeWidget(checkbox);
+    checkbox->deleteLater();
 //    intData->remove(curve);
 }
 

tools/fix_code_style.sh

+#!/bin/sh
+astyle \
+    --style=allman		\
+    --indent=spaces=4	\
+    --indent-cases		\
+    --indent-preprocessor	\
+    --break-blocks=all		\
+    --pad-oper			\
+    --pad-header		\
+    --unpad-paren		\
+    --keep-one-line-blocks	\
+    --keep-one-line-statements	\
+    --align-pointer=name	\
+    --align-reference=name	\
+    --suffix=none		\
+    --ignore-exclude-errors-x	\
+    --lineend=linux		\
+    --exclude=EASTL		\
+    $*