From 78b8580613c6756a4e10a0a35765ec2592c444ef Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 21 Sep 2016 22:04:52 +0200 Subject: [PATCH] uncrustify --- ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp | 1 + .../plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp | 1 + ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp index c5c655da2..60f867a9f 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp @@ -91,6 +91,7 @@ public: // qDebug() << "OSGGroup::updateChildren"; osg::Group *group = static_cast(self->node()); + if (!group) { qWarning() << "OSGGroup::updateChildren - null group"; return; diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp index 0ee82ac1b..1cdf5ec8e 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp @@ -877,6 +877,7 @@ void ConfigMultiRotorWidget::updateAirframe(QString frameType) // qDebug() << "ConfigMultiRotorWidget::updateAirframe - frame type" << frameType; QString elementId; + if (frameType == "Tri" || frameType == "Tricopter Y") { elementId = "tri"; } else if (frameType == "QuadX" || frameType == "Quad X") { diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h index e23e3c109..d706f2fac 100644 --- a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h +++ b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h @@ -61,7 +61,6 @@ private: void setSource(const QUrl &url); QQmlEngine *engine() const; QList errors() const; - }; #endif /* PFDQMLGADGETWIDGET_H_ */