rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00
Code Issues Releases Activity

OP-1777 Uncrustify

Browse Source
This commit is contained in:
m_thread 2015-03-16 20:41:38 +01:00
parent 6a89427aa8
commit e4e3125e72
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp
View File

@ -168,7 +168,7 @@ void UsageTrackerPlugin::collectUsageParameters(QMap<QString, QString> &paramete
parameters["fw_hash"] = devDesc.gitHash; parameters["fw_hash"] = devDesc.gitHash;
parameters["os_version"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture(); parameters["os_version"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture();
parameters["os_threads"] = QString::number(QThread::idealThreadCount()); parameters["os_threads"] = QString::number(QThread::idealThreadCount());
parameters["os_timezone"] = QTimeZone::systemTimeZoneId(); parameters["os_timezone"] = QTimeZone::systemTimeZoneId();
parameters["gcs_version"] = VersionInfo::revision(); parameters["gcs_version"] = VersionInfo::revision();
// Configuration parameters // Configuration parameters
@ -195,9 +195,9 @@ void UsageTrackerPlugin::collectUsageParameters(QMap<QString, QString> &paramete
parameters["conf_vport"] = getUAVFieldValue(objManager, "HwSettings", "USB_VCPPort"); parameters["conf_vport"] = getUAVFieldValue(objManager, "HwSettings", "USB_VCPPort");
parameters["conf_rotation"] = QString("%1:%2:%3") parameters["conf_rotation"] = QString("%1:%2:%3")
.arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 0)) .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 0))
.arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 1)) .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 1))
.arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 2)); .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()); 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(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
Core::Internal::GeneralSettings *settings = pm->getObject<Core::Internal::GeneralSettings>(); Core::Internal::GeneralSettings *settings = pm->getObject<Core::Internal::GeneralSettings>();
return settings; return settings;
} }

2
ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.h
View File

@ -56,7 +56,7 @@ private:
QString m_lastHash; QString m_lastHash;
QString getUAVFieldValue(UAVObjectManager *objManager, QString objectName, QString fieldName, int index = 0) const; QString getUAVFieldValue(UAVObjectManager *objManager, QString objectName, QString fieldName, int index = 0) const;
QString getQueryHash(QString source) const; QString getQueryHash(QString source) const;
Core::Internal::GeneralSettings * getGeneralSettings() const; Core::Internal::GeneralSettings *getGeneralSettings() const;
bool shouldSend(const QString &hash); bool shouldSend(const QString &hash);
}; };