From e4e3125e7264445936dd78f2f326f6ff99f689e6 Mon Sep 17 00:00:00 2001 From: m_thread Date: Mon, 16 Mar 2015 20:41:38 +0100 Subject: [PATCH] OP-1777 Uncrustify --- .../src/plugins/usagetracker/usagetrackerplugin.cpp | 11 ++++++----- .../src/plugins/usagetracker/usagetrackerplugin.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp index ec670480d..f38e34ee3 100644 --- a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp +++ b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp @@ -168,7 +168,7 @@ void UsageTrackerPlugin::collectUsageParameters(QMap ¶mete parameters["fw_hash"] = devDesc.gitHash; parameters["os_version"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture(); parameters["os_threads"] = QString::number(QThread::idealThreadCount()); - parameters["os_timezone"] = QTimeZone::systemTimeZoneId(); + parameters["os_timezone"] = QTimeZone::systemTimeZoneId(); parameters["gcs_version"] = VersionInfo::revision(); // Configuration parameters @@ -195,9 +195,9 @@ void UsageTrackerPlugin::collectUsageParameters(QMap ¶mete parameters["conf_vport"] = getUAVFieldValue(objManager, "HwSettings", "USB_VCPPort"); parameters["conf_rotation"] = QString("%1:%2:%3") - .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 0)) - .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 1)) - .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 2)); + .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 0)) + .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 1)) + .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 2)); } } @@ -230,10 +230,11 @@ QString UsageTrackerPlugin::getQueryHash(QString source) const return QString(QCryptographicHash::hash(QByteArray(source.toStdString().c_str()), QCryptographicHash::Md5).toHex()); } -Core::Internal::GeneralSettings * UsageTrackerPlugin::getGeneralSettings() const +Core::Internal::GeneralSettings *UsageTrackerPlugin::getGeneralSettings() const { ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); Core::Internal::GeneralSettings *settings = pm->getObject(); + return settings; } diff --git a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.h b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.h index 5a3394b47..3f1bc9b84 100644 --- a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.h +++ b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.h @@ -56,7 +56,7 @@ private: QString m_lastHash; QString getUAVFieldValue(UAVObjectManager *objManager, QString objectName, QString fieldName, int index = 0) const; QString getQueryHash(QString source) const; - Core::Internal::GeneralSettings * getGeneralSettings() const; + Core::Internal::GeneralSettings *getGeneralSettings() const; bool shouldSend(const QString &hash); };