Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
9eb2f360
Commit
9eb2f360
authored
9 years ago
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2439 from anselmolsm/foreach-qstring
Review iterations over QStrings
parents
a4e6fd28
7d47b470
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
41 additions
and
41 deletions
+41
-41
APMRadioComponent.cc
src/AutoPilotPlugins/APM/APMRadioComponent.cc
+1
-1
APMSensorsComponentController.cc
src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
+1
-1
FlightModesComponentController.cc
src/AutoPilotPlugins/PX4/FlightModesComponentController.cc
+3
-3
PX4Component.cc
src/AutoPilotPlugins/PX4/PX4Component.cc
+1
-1
PX4RadioComponent.cc
src/AutoPilotPlugins/PX4/PX4RadioComponent.cc
+1
-1
SensorsComponent.cc
src/AutoPilotPlugins/PX4/SensorsComponent.cc
+1
-1
SensorsComponentController.cc
src/AutoPilotPlugins/PX4/SensorsComponentController.cc
+1
-1
FactPanelController.cc
src/FactSystem/FactControls/FactPanelController.cc
+2
-2
ParameterLoader.cc
src/FactSystem/ParameterLoader.cc
+6
-6
HomePositionManager.cc
src/HomePositionManager.cc
+1
-1
JoystickManager.cc
src/Joystick/JoystickManager.cc
+1
-1
LogCompressor.cc
src/LogCompressor.cc
+1
-1
MissionCommands.cc
src/MissionManager/MissionCommands.cc
+3
-3
QGCApplication.cc
src/QGCApplication.cc
+3
-3
ParameterEditorController.cc
src/QmlControls/ParameterEditorController.cc
+1
-1
VideoStreaming.cc
src/VideoStreaming/VideoStreaming.cc
+1
-1
MockLink.cc
src/comm/MockLink.cc
+2
-2
QGCFlightGearLink.cc
src/comm/QGCFlightGearLink.cc
+2
-2
UDPLink.cc
src/comm/UDPLink.cc
+1
-1
MavlinkLogTest.cc
src/qgcunittest/MavlinkLogTest.cc
+1
-1
RadioConfigTest.cc
src/qgcunittest/RadioConfigTest.cc
+1
-1
LinechartPlot.cc
src/ui/linechart/LinechartPlot.cc
+2
-2
LinechartWidget.cc
src/ui/linechart/LinechartWidget.cc
+4
-4
No files found.
src/AutoPilotPlugins/APM/APMRadioComponent.cc
View file @
9eb2f360
...
...
@@ -59,7 +59,7 @@ bool APMRadioComponent::setupComplete(void) const
// controls to be mapped.
QStringList
attitudeMappings
;
attitudeMappings
<<
"RCMAP_ROLL"
<<
"RCMAP_PITCH"
<<
"RCMAP_YAW"
<<
"RCMAP_THROTTLE"
;
foreach
(
QString
mapParam
,
attitudeMappings
)
{
foreach
(
const
QString
&
mapParam
,
attitudeMappings
)
{
if
(
_autopilot
->
getParameterFact
(
FactSystem
::
defaultComponentId
,
mapParam
)
->
rawValue
().
toInt
()
==
0
)
{
return
false
;
}
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
View file @
9eb2f360
...
...
@@ -395,7 +395,7 @@ void APMSensorsComponentController::_refreshParams(void)
fastRefreshList
<<
"COMPASS_OFS_X"
<<
"COMPASS_OFS_X"
<<
"COMPASS_OFS_X"
<<
"INS_ACCOFFS_X"
<<
"INS_ACCOFFS_Y"
<<
"INS_ACCOFFS_Z"
;
foreach
(
QString
paramName
,
fastRefreshList
)
{
foreach
(
const
QString
&
paramName
,
fastRefreshList
)
{
_autopilot
->
refreshParameter
(
FactSystem
::
defaultComponentId
,
paramName
);
}
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/FlightModesComponentController.cc
View file @
9eb2f360
...
...
@@ -119,7 +119,7 @@ void FlightModesComponentController::_init(void)
QStringList
attitudeParams
;
attitudeParams
<<
"RC_MAP_THROTTLE"
<<
"RC_MAP_YAW"
<<
"RC_MAP_PITCH"
<<
"RC_MAP_ROLL"
<<
"RC_MAP_FLAPS"
<<
"RC_MAP_AUX1"
<<
"RC_MAP_AUX2"
;
foreach
(
QString
attitudeParam
,
attitudeParams
)
{
foreach
(
const
QString
&
attitudeParam
,
attitudeParams
)
{
int
channel
=
getParameterFact
(
-
1
,
attitudeParam
)
->
rawValue
().
toInt
();
if
(
channel
!=
0
)
{
usedChannels
<<
channel
;
...
...
@@ -195,7 +195,7 @@ void FlightModesComponentController::_validateConfiguration(void)
thresholdParams
<<
"RC_ASSIST_TH"
<<
"RC_AUTO_TH"
<<
"RC_ACRO_TH"
<<
"RC_POSCTL_TH"
<<
"RC_LOITER_TH"
<<
"RC_RETURN_TH"
<<
"RC_OFFB_TH"
;
foreach
(
QString
thresholdParam
,
thresholdParams
)
{
foreach
(
const
QString
&
thresholdParam
,
thresholdParams
)
{
float
threshold
=
getParameterFact
(
-
1
,
thresholdParam
)
->
rawValue
().
toFloat
();
if
(
threshold
<
0.0
f
||
threshold
>
1.0
f
)
{
_validConfiguration
=
false
;
...
...
@@ -735,7 +735,7 @@ void FlightModesComponentController::generateThresholds(void)
thresholdParams
<<
"RC_ASSIST_TH"
<<
"RC_AUTO_TH"
<<
"RC_ACRO_TH"
<<
"RC_POSCTL_TH"
<<
"RC_LOITER_TH"
<<
"RC_RETURN_TH"
<<
"RC_OFFB_TH"
;
foreach
(
QString
thresholdParam
,
thresholdParams
)
{
foreach
(
const
QString
&
thresholdParam
,
thresholdParams
)
{
getParameterFact
(
-
1
,
thresholdParam
)
->
setRawValue
(
0.0
f
);
}
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/PX4Component.cc
View file @
9eb2f360
...
...
@@ -38,7 +38,7 @@ PX4Component::PX4Component(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject
void
PX4Component
::
setupTriggerSignals
(
void
)
{
// Watch for changed on trigger list params
foreach
(
QString
paramName
,
setupCompleteChangedTriggerList
())
{
foreach
(
const
QString
&
paramName
,
setupCompleteChangedTriggerList
())
{
Fact
*
fact
=
_autopilot
->
getParameterFact
(
FactSystem
::
defaultComponentId
,
paramName
);
connect
(
fact
,
&
Fact
::
valueChanged
,
this
,
&
PX4Component
::
_triggerUpdated
);
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/PX4RadioComponent.cc
View file @
9eb2f360
...
...
@@ -59,7 +59,7 @@ bool PX4RadioComponent::setupComplete(void) const
// controls to be mapped.
QStringList
attitudeMappings
;
attitudeMappings
<<
"RC_MAP_ROLL"
<<
"RC_MAP_PITCH"
<<
"RC_MAP_YAW"
<<
"RC_MAP_THROTTLE"
;
foreach
(
QString
mapParam
,
attitudeMappings
)
{
foreach
(
const
QString
&
mapParam
,
attitudeMappings
)
{
if
(
_autopilot
->
getParameterFact
(
FactSystem
::
defaultComponentId
,
mapParam
)
->
rawValue
().
toInt
()
==
0
)
{
return
false
;
}
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/SensorsComponent.cc
View file @
9eb2f360
...
...
@@ -61,7 +61,7 @@ bool SensorsComponent::requiresSetup(void) const
bool
SensorsComponent
::
setupComplete
(
void
)
const
{
foreach
(
QString
triggerParam
,
setupCompleteChangedTriggerList
())
{
foreach
(
const
QString
&
triggerParam
,
setupCompleteChangedTriggerList
())
{
if
(
_autopilot
->
getParameterFact
(
FactSystem
::
defaultComponentId
,
triggerParam
)
->
rawValue
().
toFloat
()
==
0.0
f
)
{
return
false
;
}
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/SensorsComponentController.cc
View file @
9eb2f360
...
...
@@ -434,7 +434,7 @@ void SensorsComponentController::_refreshParams(void)
// We ask for a refresh on these first so that the rotation combo show up as fast as possible
fastRefreshList
<<
"CAL_MAG0_ID"
<<
"CAL_MAG1_ID"
<<
"CAL_MAG2_ID"
<<
"CAL_MAG0_ROT"
<<
"CAL_MAG1_ROT"
<<
"CAL_MAG2_ROT"
;
foreach
(
QString
paramName
,
fastRefreshList
)
{
foreach
(
const
QString
&
paramName
,
fastRefreshList
)
{
_autopilot
->
refreshParameter
(
FactSystem
::
defaultComponentId
,
paramName
);
}
...
...
This diff is collapsed.
Click to expand it.
src/FactSystem/FactControls/FactPanelController.cc
View file @
9eb2f360
...
...
@@ -61,7 +61,7 @@ void FactPanelController::setFactPanel(QQuickItem* panel)
// missing fact notices that were waiting to go out
_factPanel
=
panel
;
foreach
(
QString
missingParam
,
_delayedMissingParams
)
{
foreach
(
const
QString
&
missingParam
,
_delayedMissingParams
)
{
_notifyPanelMissingParameter
(
missingParam
);
}
_delayedMissingParams
.
clear
();
...
...
@@ -112,7 +112,7 @@ bool FactPanelController::_allParametersExists(int componentId, QStringList name
{
bool
noMissingFacts
=
true
;
foreach
(
QString
name
,
names
)
{
foreach
(
const
QString
&
name
,
names
)
{
if
(
_autopilot
&&
!
_autopilot
->
parameterExists
(
componentId
,
name
))
{
_reportMissingParameter
(
componentId
,
name
);
noMissingFacts
=
false
;
...
...
This diff is collapsed.
Click to expand it.
src/FactSystem/ParameterLoader.cc
View file @
9eb2f360
...
...
@@ -380,7 +380,7 @@ void ParameterLoader::refreshParametersPrefix(int componentId, const QString& na
componentId
=
_actualComponentId
(
componentId
);
qCDebug
(
ParameterLoaderLog
)
<<
"refreshParametersPrefix (component id:"
<<
componentId
<<
"name:"
<<
namePrefix
<<
")"
;
foreach
(
QString
name
,
_mapParameterName2Variant
[
componentId
].
keys
())
{
foreach
(
const
QString
&
name
,
_mapParameterName2Variant
[
componentId
].
keys
())
{
if
(
name
.
startsWith
(
namePrefix
))
{
refreshParameter
(
componentId
,
name
);
}
...
...
@@ -415,7 +415,7 @@ QStringList ParameterLoader::parameterNames(int componentId)
{
QStringList
names
;
foreach
(
QString
paramName
,
_mapParameterName2Variant
[
_actualComponentId
(
componentId
)].
keys
())
{
foreach
(
const
QString
&
paramName
,
_mapParameterName2Variant
[
_actualComponentId
(
componentId
)].
keys
())
{
names
<<
paramName
;
}
...
...
@@ -425,7 +425,7 @@ QStringList ParameterLoader::parameterNames(int componentId)
void
ParameterLoader
::
_setupGroupMap
(
void
)
{
foreach
(
int
componentId
,
_mapParameterName2Variant
.
keys
())
{
foreach
(
QString
name
,
_mapParameterName2Variant
[
componentId
].
keys
())
{
foreach
(
const
QString
&
name
,
_mapParameterName2Variant
[
componentId
].
keys
())
{
Fact
*
fact
=
_mapParameterName2Variant
[
componentId
][
name
].
value
<
Fact
*>
();
_mapGroup2ParameterName
[
componentId
][
fact
->
group
()]
+=
name
;
}
...
...
@@ -471,7 +471,7 @@ void ParameterLoader::_waitingParamTimeout(void)
if
(
!
paramsRequested
)
{
foreach
(
int
componentId
,
_waitingWriteParamNameMap
.
keys
())
{
foreach
(
QString
paramName
,
_waitingWriteParamNameMap
[
componentId
].
keys
())
{
foreach
(
const
QString
&
paramName
,
_waitingWriteParamNameMap
[
componentId
].
keys
())
{
paramsRequested
=
true
;
_waitingWriteParamNameMap
[
componentId
][
paramName
]
++
;
// Bump retry count
_writeParameterRaw
(
componentId
,
paramName
,
_autopilot
->
getFact
(
FactSystem
::
ParameterProvider
,
componentId
,
paramName
)
->
rawValue
());
...
...
@@ -486,7 +486,7 @@ void ParameterLoader::_waitingParamTimeout(void)
if
(
!
paramsRequested
)
{
foreach
(
int
componentId
,
_waitingReadParamNameMap
.
keys
())
{
foreach
(
QString
paramName
,
_waitingReadParamNameMap
[
componentId
].
keys
())
{
foreach
(
const
QString
&
paramName
,
_waitingReadParamNameMap
[
componentId
].
keys
())
{
paramsRequested
=
true
;
_waitingReadParamNameMap
[
componentId
][
paramName
]
++
;
// Bump retry count
_readParameterRaw
(
componentId
,
paramName
,
-
1
);
...
...
@@ -715,7 +715,7 @@ void ParameterLoader::writeParametersToStream(QTextStream &stream)
stream
<<
"# MAV ID COMPONENT ID PARAM NAME VALUE (FLOAT)
\n
"
;
foreach
(
int
componentId
,
_mapParameterName2Variant
.
keys
())
{
foreach
(
QString
paramName
,
_mapParameterName2Variant
[
componentId
].
keys
())
{
foreach
(
const
QString
&
paramName
,
_mapParameterName2Variant
[
componentId
].
keys
())
{
Fact
*
fact
=
_mapParameterName2Variant
[
componentId
][
paramName
].
value
<
Fact
*>
();
Q_ASSERT
(
fact
);
...
...
This diff is collapsed.
Click to expand it.
src/HomePositionManager.cc
View file @
9eb2f360
...
...
@@ -97,7 +97,7 @@ void HomePositionManager::_loadSettings(void)
settings
.
beginGroup
(
_settingsGroup
);
foreach
(
QString
name
,
settings
.
childGroups
())
{
foreach
(
const
QString
&
name
,
settings
.
childGroups
())
{
QGeoCoordinate
coordinate
;
qDebug
()
<<
"Load setting"
<<
name
;
...
...
This diff is collapsed.
Click to expand it.
src/Joystick/JoystickManager.cc
View file @
9eb2f360
...
...
@@ -145,7 +145,7 @@ QVariantList JoystickManager::joysticks(void)
{
QVariantList
list
;
foreach
(
QString
name
,
_name2JoystickMap
.
keys
())
{
foreach
(
const
QString
&
name
,
_name2JoystickMap
.
keys
())
{
list
+=
QVariant
::
fromValue
(
_name2JoystickMap
[
name
]);
}
...
...
This diff is collapsed.
Click to expand it.
src/LogCompressor.cc
View file @
9eb2f360
...
...
@@ -172,7 +172,7 @@ void LogCompressor::run()
// Fill holes if necessary
if
(
holeFillingEnabled
)
{
int
index
=
0
;
foreach
(
QString
str
,
list
)
{
foreach
(
const
QString
&
str
,
list
)
{
if
(
str
==
""
||
str
==
"NaN"
)
{
list
.
replace
(
index
,
lastList
.
at
(
index
));
}
...
...
This diff is collapsed.
Click to expand it.
src/MissionManager/MissionCommands.cc
View file @
9eb2f360
...
...
@@ -130,7 +130,7 @@ void MissionCommands::_loadMavCmdInfoJson(void)
// Make sure we have the required keys
QStringList
requiredKeys
;
requiredKeys
<<
_idJsonKey
<<
_rawNameJsonKey
;
foreach
(
QString
key
,
requiredKeys
)
{
foreach
(
const
QString
&
key
,
requiredKeys
)
{
if
(
!
jsonObject
.
contains
(
key
))
{
qWarning
()
<<
"Mission required key"
<<
key
;
return
;
...
...
@@ -211,7 +211,7 @@ void MissionCommands::_loadMavCmdInfoJson(void)
paramInfo
->
_units
=
paramObject
.
value
(
_unitsJsonKey
).
toString
();
QStringList
enumValues
=
paramObject
.
value
(
_enumValuesJsonKey
).
toString
().
split
(
","
,
QString
::
SkipEmptyParts
);
foreach
(
QString
enumValue
,
enumValues
)
{
foreach
(
const
QString
&
enumValue
,
enumValues
)
{
bool
convertOk
;
double
value
=
enumValue
.
toDouble
(
&
convertOk
);
...
...
@@ -295,7 +295,7 @@ const QStringList MissionCommands::categories(Vehicle* vehicle) const
{
QStringList
list
;
foreach
(
QString
category
,
_categoryToMavCmdInfoListMap
[
_firmwareTypeFromVehicle
(
vehicle
)].
keys
())
{
foreach
(
const
QString
&
category
,
_categoryToMavCmdInfoListMap
[
_firmwareTypeFromVehicle
(
vehicle
)].
keys
())
{
list
<<
category
;
}
...
...
This diff is collapsed.
Click to expand it.
src/QGCApplication.cc
View file @
9eb2f360
...
...
@@ -226,7 +226,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
filterRules
+=
".debug=false
\n
"
;
}
}
else
{
foreach
(
QString
rule
,
logList
)
{
foreach
(
const
QString
&
rule
,
logList
)
{
filterRules
+=
rule
;
filterRules
+=
".debug=true
\n
"
;
}
...
...
@@ -261,7 +261,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
QTextStream
out
(
&
loggingFile
);
out
<<
"[Rules]
\n
"
;
out
<<
"*Log.debug=false
\n
"
;
foreach
(
QString
category
,
QGCLoggingCategoryRegister
::
instance
()
->
registeredCategories
())
{
foreach
(
const
QString
&
category
,
QGCLoggingCategoryRegister
::
instance
()
->
registeredCategories
())
{
out
<<
category
<<
".debug=false
\n
"
;
}
}
else
{
...
...
@@ -737,7 +737,7 @@ void QGCApplication::_missingParamsDisplay(void)
Q_ASSERT
(
_missingParams
.
count
());
QString
params
;
foreach
(
QString
name
,
_missingParams
)
{
foreach
(
const
QString
&
name
,
_missingParams
)
{
if
(
params
.
isEmpty
())
{
params
+=
name
;
}
else
{
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/ParameterEditorController.cc
View file @
9eb2f360
...
...
@@ -69,7 +69,7 @@ QStringList ParameterEditorController::searchParametersForComponent(int componen
{
QStringList
list
;
foreach
(
QString
paramName
,
_autopilot
->
parameterNames
(
componentId
))
{
foreach
(
const
QString
&
paramName
,
_autopilot
->
parameterNames
(
componentId
))
{
if
(
searchText
.
isEmpty
())
{
list
+=
paramName
;
}
else
{
...
...
This diff is collapsed.
Click to expand it.
src/VideoStreaming/VideoStreaming.cc
View file @
9eb2f360
...
...
@@ -98,7 +98,7 @@ void initializeVideoStreaming(int &argc, char* argv[])
qgcputenv
(
"GST_PLUGIN_PATH_1_0"
,
currentDir
,
"/../Frameworks/GStreamer.framework/Versions/Current/lib/gstreamer-1.0"
);
qgcputenv
(
"GST_PLUGIN_PATH"
,
currentDir
,
"/../Frameworks/GStreamer.framework/Versions/Current/lib/gstreamer-1.0"
);
// QStringList env = QProcessEnvironment::systemEnvironment().keys();
// foreach(
QString
key, env) {
// foreach(
const QString &
key, env) {
// qDebug() << key << QProcessEnvironment::systemEnvironment().value(key);
// }
#endif
...
...
This diff is collapsed.
Click to expand it.
src/comm/MockLink.cc
View file @
9eb2f360
...
...
@@ -562,7 +562,7 @@ void MockLink::_handleParamRequestList(const mavlink_message_t& msg)
uint16_t
paramIndex
=
0
;
int
cParameters
=
_mapParamName2Value
[
componentId
].
count
();
foreach
(
QString
paramName
,
_mapParamName2Value
[
componentId
].
keys
())
{
foreach
(
const
QString
&
paramName
,
_mapParamName2Value
[
componentId
].
keys
())
{
char
paramId
[
MAVLINK_MSG_ID_PARAM_VALUE_LEN
];
mavlink_message_t
responseMsg
;
...
...
@@ -596,7 +596,7 @@ void MockLink::_handleParamRequestList(const mavlink_message_t& msg)
int
cParameters
=
_mapParamName2Value
[
componentId
].
count
();
bool
skipParam
=
true
;
foreach
(
QString
paramName
,
_mapParamName2Value
[
componentId
].
keys
())
{
foreach
(
const
QString
&
paramName
,
_mapParamName2Value
[
componentId
].
keys
())
{
if
(
skipParam
)
{
// We've already sent the first param
skipParam
=
false
;
...
...
This diff is collapsed.
Click to expand it.
src/comm/QGCFlightGearLink.cc
View file @
9eb2f360
...
...
@@ -988,7 +988,7 @@ void QGCFlightGearLink::_printFgfsOutput(void)
QByteArray
byteArray
=
_fgProcess
->
readAllStandardOutput
();
QStringList
strLines
=
QString
(
byteArray
).
split
(
"
\n
"
);
foreach
(
QString
line
,
strLines
){
foreach
(
const
QString
&
line
,
strLines
){
qDebug
()
<<
line
;
}
}
...
...
@@ -1000,7 +1000,7 @@ void QGCFlightGearLink::_printFgfsError(void)
QByteArray
byteArray
=
_fgProcess
->
readAllStandardError
();
QStringList
strLines
=
QString
(
byteArray
).
split
(
"
\n
"
);
foreach
(
QString
line
,
strLines
){
foreach
(
const
QString
&
line
,
strLines
){
qDebug
()
<<
line
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/comm/UDPLink.cc
View file @
9eb2f360
...
...
@@ -231,7 +231,7 @@ void UDPLink::_sendBytes(const char* data, qint64 size)
}
}
while
(
_config
->
nextHost
(
host
,
port
));
//-- Remove hosts that are no longer there
foreach
(
QString
ghost
,
goneHosts
)
{
foreach
(
const
QString
&
ghost
,
goneHosts
)
{
_config
->
removeHost
(
ghost
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/qgcunittest/MavlinkLogTest.cc
View file @
9eb2f360
...
...
@@ -51,7 +51,7 @@ void MavlinkLogTest::init(void)
// Make sure temp directory is clear of mavlink logs
QDir
tmpDir
(
QStandardPaths
::
writableLocation
(
QStandardPaths
::
TempLocation
));
QStringList
logFiles
(
tmpDir
.
entryList
(
QStringList
(
QString
(
"*.%1"
).
arg
(
_logFileExtension
)),
QDir
::
Files
));
foreach
(
QString
logFile
,
logFiles
)
{
foreach
(
const
QString
&
logFile
,
logFiles
)
{
bool
success
=
tmpDir
.
remove
(
logFile
);
Q_UNUSED
(
success
);
Q_ASSERT
(
success
);
...
...
This diff is collapsed.
Click to expand it.
src/qgcunittest/RadioConfigTest.cc
View file @
9eb2f360
...
...
@@ -407,7 +407,7 @@ void RadioConfigTest::_fullCalibrationWorker(MAV_AUTOPILOT firmwareType)
QStringList
switchList
;
switchList
<<
"RC_MAP_MODE_SW"
<<
"RC_MAP_LOITER_SW"
<<
"RC_MAP_RETURN_SW"
<<
"RC_MAP_POSCTL_SW"
<<
"RC_MAP_ACRO_SW"
;
foreach
(
QString
switchParam
,
switchList
)
{
foreach
(
const
QString
&
switchParam
,
switchList
)
{
Q_ASSERT
(
_autopilot
->
getParameterFact
(
FactSystem
::
defaultComponentId
,
switchParam
)
->
rawValue
().
toInt
()
!=
channel
+
1
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/ui/linechart/LinechartPlot.cc
View file @
9eb2f360
...
...
@@ -183,7 +183,7 @@ void LinechartPlot::setActive(bool active)
void
LinechartPlot
::
removeTimedOutCurves
()
{
foreach
(
QString
key
,
lastUpdate
.
keys
())
foreach
(
const
QString
&
key
,
lastUpdate
.
keys
())
{
quint64
time
=
lastUpdate
.
value
(
key
);
if
(
QGC
::
groundTimeMilliseconds
()
-
time
>
10000
)
...
...
@@ -499,7 +499,7 @@ bool LinechartPlot::isVisible(QString id)
bool
LinechartPlot
::
anyCurveVisible
()
{
bool
visible
=
false
;
foreach
(
QString
key
,
curves
.
keys
())
foreach
(
const
QString
&
key
,
curves
.
keys
())
{
if
(
curves
.
value
(
key
)
->
isVisible
())
{
...
...
This diff is collapsed.
Click to expand it.
src/ui/linechart/LinechartWidget.cc
View file @
9eb2f360
...
...
@@ -673,7 +673,7 @@ void LinechartWidget::removeCurve(QString curve)
void
LinechartWidget
::
recolor
()
{
activePlot
->
styleChanged
(
qgcApp
()
->
styleIsDark
());
foreach
(
QString
key
,
colorIcons
.
keys
())
foreach
(
const
QString
&
key
,
colorIcons
.
keys
())
{
QWidget
*
colorIcon
=
colorIcons
.
value
(
key
,
0
);
if
(
colorIcon
&&
!
colorIcon
->
styleSheet
().
isEmpty
())
...
...
@@ -713,7 +713,7 @@ void LinechartWidget::filterCurves(const QString &filter)
{
/* Hide Elements which do not match the filter pattern */
QStringMatcher
stringMatcher
(
filter
,
Qt
::
CaseInsensitive
);
foreach
(
QString
key
,
colorIcons
.
keys
())
foreach
(
const
QString
&
key
,
colorIcons
.
keys
())
{
if
(
stringMatcher
.
indexIn
(
key
)
<
0
)
{
...
...
@@ -728,7 +728,7 @@ void LinechartWidget::filterCurves(const QString &filter)
else
{
/* Show all Elements */
foreach
(
QString
key
,
colorIcons
.
keys
())
foreach
(
const
QString
&
key
,
colorIcons
.
keys
())
{
filterCurve
(
key
,
true
);
}
...
...
@@ -796,7 +796,7 @@ QString LinechartWidget::getCurveName(const QString& key, bool shortEnabled)
void
LinechartWidget
::
setShortNames
(
bool
enable
)
{
foreach
(
QString
key
,
curveNames
.
keys
())
foreach
(
const
QString
&
key
,
curveNames
.
keys
())
{
curveNameLabels
.
value
(
key
)
->
setText
(
getCurveName
(
key
,
enable
));
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment