From 3d8e3eb823ac8b144c723b2b895e0ddbf9d088b0 Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Thu, 9 Jan 2014 19:52:56 +0100 Subject: [PATCH] OP-984 Uncrustify. --- .../src/plugins/config/configstabilizationwidget.cpp | 9 ++++----- .../src/plugins/config/configstabilizationwidget.h | 2 +- .../plugins/uavobjectwidgetutils/configtaskwidget.cpp | 4 ++-- .../src/plugins/uavobjectwidgetutils/configtaskwidget.h | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index d74ebf9a0..ebc148c19 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -49,7 +49,7 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa ui = new Ui_StabilizationWidget(); ui->setupUi(this); - StabilizationSettings* stabSettings = qobject_cast(getObject("StabilizationSettings")); + StabilizationSettings *stabSettings = qobject_cast(getObject("StabilizationSettings")); Q_ASSERT(stabSettings); m_pidBankCount = stabSettings->getField("FlightModeMap")->getOptions().count(); @@ -68,7 +68,7 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa } for (int i = 0; i < m_pidBankCount; i++) { - if(i > 0) { + if (i > 0) { m_stabilizationObjectsString.append(","); } m_stabilizationObjectsString.append(m_pidTabBars.at(0)->tabData(i).toString()); @@ -234,14 +234,13 @@ void ConfigStabilizationWidget::onBoardConnected() void ConfigStabilizationWidget::pidBankChanged(int index) { - foreach(QTabBar * tabBar, m_pidTabBars) { disconnect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(pidBankChanged(int))); tabBar->setCurrentIndex(index); connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(pidBankChanged(int))); } - for(int i = 0; i < m_pidTabBars.at(0)->count(); i++) { + for (int i = 0; i < m_pidTabBars.at(0)->count(); i++) { setWidgetBindingObjectEnabled(m_pidTabBars.at(0)->tabData(i).toString(), false); } @@ -262,7 +261,7 @@ bool ConfigStabilizationWidget::shouldObjectBeSaved(UAVObject *object) QString ConfigStabilizationWidget::mapObjectName(const QString objectName) { - if(objectName == "StabilizationSettingsBankX") { + if (objectName == "StabilizationSettingsBankX") { return m_stabilizationObjectsString; } return ConfigTaskWidget::mapObjectName(objectName); diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h index 67c7e246a..c2ae524b8 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h @@ -48,7 +48,7 @@ public: private: Ui_StabilizationWidget *ui; QTimer *realtimeUpdates; - QList m_pidTabBars; + QList m_pidTabBars; QString m_stabilizationObjectsString; // Milliseconds between automatic 'Instant Updates' diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp index 41a3223d0..c79b5fdd1 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp +++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp @@ -176,13 +176,13 @@ void ConfigTaskWidget::setWidgetBindingObjectEnabled(QString objectName, bool en foreach(WidgetBinding * binding, m_widgetBindingsPerObject.values(object)) { binding->setIsEnabled(enabled); if (enabled) { - //disconnectWidgetUpdatesToSlot(binding->widget(), SLOT(widgetsContentsChanged())); + // disconnectWidgetUpdatesToSlot(binding->widget(), SLOT(widgetsContentsChanged())); if (binding->value().isValid() && !binding->value().isNull()) { setWidgetFromVariant(binding->widget(), binding->value(), binding->scale()); } else { setWidgetFromField(binding->widget(), binding->field(), binding->index(), binding->scale(), binding->isLimited()); } - //connectWidgetUpdatesToSlot(binding->widget(), SLOT(widgetsContentsChanged())); + // connectWidgetUpdatesToSlot(binding->widget(), SLOT(widgetsContentsChanged())); } } } diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h index 408da0e7d..14db4b4c2 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h +++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h @@ -234,7 +234,7 @@ private: int fieldIndexFromElementName(QString objectName, QString fieldName, QString elementName); void doAddWidgetBinding(QString objectName, QString fieldName, QWidget *widget, int index = 0, double scale = 1, - bool isLimited = false, QList *reloadGroupIDs = 0, quint32 instID = 0); + bool isLimited = false, QList *reloadGroupIDs = 0, quint32 instID = 0); protected slots: virtual void disableObjectUpdates();