Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3be77bd2
Commit
3be77bd2
authored
Oct 23, 2018
by
Patrick José Pereira
Browse files
QmlControls: Change from foreach to c++11 for
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
dbec9e98
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/QmlControls/ParameterEditorController.cc
View file @
3be77bd2
...
...
@@ -70,7 +70,7 @@ QStringList ParameterEditorController::searchParameters(const QString& searchTex
{
QStringList
list
;
for
each
(
const
QString
&
paramName
,
_vehicle
->
parameterManager
()
->
parameterNames
(
_vehicle
->
defaultComponentId
()))
{
for
(
const
QString
&
paramName
:
_vehicle
->
parameterManager
()
->
parameterNames
(
_vehicle
->
defaultComponentId
()))
{
if
(
searchText
.
isEmpty
())
{
list
+=
paramName
;
}
else
{
...
...
@@ -168,11 +168,11 @@ void ParameterEditorController::_updateParameters(void)
if
(
searchItems
.
isEmpty
())
{
const
QMap
<
QString
,
QMap
<
QString
,
QStringList
>
>&
categoryMap
=
_vehicle
->
parameterManager
()
->
getCategoryMap
();
for
each
(
const
QString
&
parameter
,
categoryMap
[
_currentCategory
][
_currentGroup
])
{
for
(
const
QString
&
parameter
:
categoryMap
[
_currentCategory
][
_currentGroup
])
{
newParameterList
.
append
(
_vehicle
->
parameterManager
()
->
getParameter
(
_vehicle
->
defaultComponentId
(),
parameter
));
}
}
else
{
for
each
(
const
QString
&
parameter
,
_vehicle
->
parameterManager
()
->
parameterNames
(
_vehicle
->
defaultComponentId
()))
{
for
(
const
QString
&
parameter
:
_vehicle
->
parameterManager
()
->
parameterNames
(
_vehicle
->
defaultComponentId
()))
{
Fact
*
fact
=
_vehicle
->
parameterManager
()
->
getParameter
(
_vehicle
->
defaultComponentId
(),
parameter
);
bool
matched
=
true
;
...
...
src/QmlControls/QGCFileDialogController.cc
View file @
3be77bd2
...
...
@@ -24,13 +24,13 @@ QStringList QGCFileDialogController::getFiles(const QString& directoryPath, cons
QDir
fileDir
(
directoryPath
);
QStringList
infoListExtensions
;
for
each
(
const
QString
&
extension
,
fileExtensions
)
{
for
(
const
QString
&
extension
:
fileExtensions
)
{
infoListExtensions
.
append
(
QStringLiteral
(
"*.%1"
).
arg
(
extension
));
}
QFileInfoList
fileInfoList
=
fileDir
.
entryInfoList
(
infoListExtensions
,
QDir
::
Files
,
QDir
::
Name
);
for
each
(
const
QFileInfo
&
fileInfo
,
fileInfoList
)
{
for
(
const
QFileInfo
&
fileInfo
:
fileInfoList
)
{
qCDebug
(
QGCFileDialogControllerLog
)
<<
"getFiles found"
<<
fileInfo
.
fileName
();
files
<<
fileInfo
.
fileName
();
}
...
...
src/QmlControls/QmlObjectListModel.cc
View file @
3be77bd2
...
...
@@ -183,7 +183,7 @@ void QmlObjectListModel::insert(int i, QList<QObject*> objects)
}
int
j
=
i
;
for
each
(
QObject
*
object
,
objects
)
{
for
(
QObject
*
object
:
objects
)
{
QQmlEngine
::
setObjectOwnership
(
object
,
QQmlEngine
::
CppOwnership
);
// Look for a dirtyChanged signal on the object
...
...
@@ -233,7 +233,7 @@ void QmlObjectListModel::setDirty(bool dirty)
_dirty
=
dirty
;
if
(
!
dirty
)
{
// Need to clear dirty from all children
for
each
(
QObject
*
object
,
_objectList
)
{
for
(
QObject
*
object
:
_objectList
)
{
if
(
object
->
property
(
"dirty"
).
isValid
())
{
object
->
setProperty
(
"dirty"
,
false
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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