From 8d76e6f6715c3dacc9fba8deac1597f3da2619f5 Mon Sep 17 00:00:00 2001 From: m_thread Date: Thu, 25 Sep 2014 23:19:50 +0200 Subject: [PATCH] OP-1222 Uncrustified code. --- .../setupwizard/pages/airframeinitialtuningpage.cpp | 2 ++ .../plugins/setupwizard/vehicleconfigurationhelper.cpp | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp index d3383f07c..a8fcb3dca 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp @@ -162,6 +162,7 @@ void AirframeInitialTuningPage::loadValidFiles() QStringList files = templateDir.entryList(); foreach(QString fileName, files) { QFile file(QString("%1/%2").arg(templateDir.absolutePath()).arg(fileName)); + if (file.open(QFile::ReadOnly)) { QByteArray jsonData = file.readAll(); QJsonDocument templateDoc = QJsonDocument::fromJson(jsonData); @@ -185,6 +186,7 @@ void AirframeInitialTuningPage::setupTemplateList() item->setData(Qt::UserRole + 1, QVariant::fromValue((QJsonObject *)NULL)); foreach(QString templ, m_templates.keys()) { QJsonObject *json = m_templates[templ]; + item = new QListWidgetItem(json->value("name").toString(), ui->templateList); item->setData(Qt::UserRole + 1, QVariant::fromValue(json)); } diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index 2cfa8df32..f8e7c29a7 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -753,11 +753,12 @@ void VehicleConfigurationHelper::applyManualControlDefaults() void VehicleConfigurationHelper::applyTemplateSettings() { if (m_configSource->getVehicleTemplate() != NULL) { - QJsonObject* json = m_configSource->getVehicleTemplate(); - QList updatedObjects; + QJsonObject *json = m_configSource->getVehicleTemplate(); + QList updatedObjects; m_uavoManager->fromJson(*json, &updatedObjects); - foreach (UAVObject* object, updatedObjects) { - UAVDataObject *dataObj = dynamic_cast(object); + foreach(UAVObject * object, updatedObjects) { + UAVDataObject *dataObj = dynamic_cast(object); + if (dataObj != NULL) { addModifiedObject(dataObj, QString(tr("Writing template settings for %1")).arg(object->getName())); }