Browse Source

QmlControls: Change from foreach to c++11 for

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
QGC4.4
Patrick José Pereira 7 years ago
parent
commit
3be77bd260
  1. 6
      src/QmlControls/ParameterEditorController.cc
  2. 4
      src/QmlControls/QGCFileDialogController.cc
  3. 4
      src/QmlControls/QmlObjectListModel.cc

6
src/QmlControls/ParameterEditorController.cc

@ -70,7 +70,7 @@ QStringList ParameterEditorController::searchParameters(const QString& searchTex @@ -70,7 +70,7 @@ QStringList ParameterEditorController::searchParameters(const QString& searchTex
{
QStringList list;
foreach(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) @@ -168,11 +168,11 @@ void ParameterEditorController::_updateParameters(void)
if (searchItems.isEmpty()) {
const QMap<QString, QMap<QString, QStringList> >& categoryMap = _vehicle->parameterManager()->getCategoryMap();
foreach (const QString& parameter, categoryMap[_currentCategory][_currentGroup]) {
for (const QString& parameter: categoryMap[_currentCategory][_currentGroup]) {
newParameterList.append(_vehicle->parameterManager()->getParameter(_vehicle->defaultComponentId(), parameter));
}
} else {
foreach(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;

4
src/QmlControls/QGCFileDialogController.cc

@ -24,13 +24,13 @@ QStringList QGCFileDialogController::getFiles(const QString& directoryPath, cons @@ -24,13 +24,13 @@ QStringList QGCFileDialogController::getFiles(const QString& directoryPath, cons
QDir fileDir(directoryPath);
QStringList infoListExtensions;
foreach (const QString& extension, fileExtensions) {
for (const QString& extension: fileExtensions) {
infoListExtensions.append(QStringLiteral("*.%1").arg(extension));
}
QFileInfoList fileInfoList = fileDir.entryInfoList(infoListExtensions, QDir::Files, QDir::Name);
foreach (const QFileInfo& fileInfo, fileInfoList) {
for (const QFileInfo& fileInfo: fileInfoList) {
qCDebug(QGCFileDialogControllerLog) << "getFiles found" << fileInfo.fileName();
files << fileInfo.fileName();
}

4
src/QmlControls/QmlObjectListModel.cc

@ -183,7 +183,7 @@ void QmlObjectListModel::insert(int i, QList<QObject*> objects) @@ -183,7 +183,7 @@ void QmlObjectListModel::insert(int i, QList<QObject*> objects)
}
int j = i;
foreach (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) @@ -233,7 +233,7 @@ void QmlObjectListModel::setDirty(bool dirty)
_dirty = dirty;
if (!dirty) {
// Need to clear dirty from all children
foreach(QObject* object, _objectList) {
for(QObject* object: _objectList) {
if (object->property("dirty").isValid()) {
object->setProperty("dirty", false);
}

Loading…
Cancel
Save