kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: Use auto and range-based for (#7481)

Browse Source 
* On lines where the variable type is obvious from inspection, avoid repeating the type using auto. 
* When possible use a ranged for loop instead of begin() and end() iterators
This commit is contained in:
berniev
2022-09-15 04:25:13 +10:00
committed by GitHub
parent f7c84dfd09
commit ae53c9b0a4
175 changed files with 2051 additions and 2057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Gui/SceneInspector.cpp
View File

@@ -93,7 +93,7 @@ void SceneModel::setNode(QModelIndex index, SoNode* node)
{
this->setData(index, QVariant(QString::fromLatin1(node->getTypeId().getName())));
if (node->getTypeId().isDerivedFrom(SoGroup::getClassTypeId())) {
SoGroup *group = static_cast<SoGroup*>(node);
auto group = static_cast<SoGroup*>(node);
// insert SoGroup icon
this->insertColumns(0,2,index);
this->insertRows(0,group->getNumChildren(), index);
@@ -137,7 +137,7 @@ DlgInspector::DlgInspector(QWidget* parent, Qt::WindowFlags fl)
ui->setupUi(this);
setWindowTitle(tr("Scene Inspector"));
SceneModel* model = new SceneModel(this);
auto model = new SceneModel(this);
ui->treeView->setModel(model);
ui->treeView->setRootIsDecorated(true);
}
@@ -155,7 +155,7 @@ void DlgInspector::setDocument(Gui::Document* doc)
{
setNodeNames(doc);
View3DInventor* view = qobject_cast<View3DInventor*>(doc->getActiveView());
auto view = qobject_cast<View3DInventor*>(doc->getActiveView());
if (view) {
View3DInventorViewer* viewer = view->getViewer();
setNode(viewer->getSceneGraph());
@@ -165,7 +165,7 @@ void DlgInspector::setDocument(Gui::Document* doc)
void DlgInspector::setNode(SoNode* node)
{
SceneModel* model = static_cast<SceneModel*>(ui->treeView->model());
auto model = static_cast<SceneModel*>(ui->treeView->model());
model->setNode(node);
QHeaderView* header = ui->treeView->header();
@@ -178,8 +178,8 @@ void DlgInspector::setNodeNames(Gui::Document* doc)
std::vector<Gui::ViewProvider*> vps = doc->getViewProvidersOfType
(Gui::ViewProviderDocumentObject::getClassTypeId());
QHash<SoNode*, QString> nodeNames;
for (std::vector<Gui::ViewProvider*>::iterator it = vps.begin(); it != vps.end(); ++it) {
Gui::ViewProviderDocumentObject* vp = static_cast<Gui::ViewProviderDocumentObject*>(*it);
for (const auto & it : vps) {
auto vp = static_cast<Gui::ViewProviderDocumentObject*>(it);
App::DocumentObject* obj = vp->getObject();
if (obj) {
QString label = QString::fromUtf8(obj->Label.getValue());
@@ -187,15 +187,15 @@ void DlgInspector::setNodeNames(Gui::Document* doc)
}
std::vector<std::string> modes = vp->getDisplayMaskModes();
for (std::vector<std::string>::iterator jt = modes.begin(); jt != modes.end(); ++jt) {
SoNode* node = vp->getDisplayMaskMode(jt->c_str());
for (const auto & mode : modes) {
SoNode* node = vp->getDisplayMaskMode(mode.c_str());
if (node) {
nodeNames[node] = QString::fromStdString(*jt);
nodeNames[node] = QString::fromStdString(mode);
}
}
}
SceneModel* model = static_cast<SceneModel*>(ui->treeView->model());
auto model = static_cast<SceneModel*>(ui->treeView->model());
model->setNodeNames(nodeNames);
}
@@ -214,7 +214,7 @@ void DlgInspector::on_refreshButton_clicked()
if (doc) {
setNodeNames(doc);
View3DInventor* view = qobject_cast<View3DInventor*>(doc->getActiveView());
auto view = qobject_cast<View3DInventor*>(doc->getActiveView());
if (view) {
View3DInventorViewer* viewer = view->getViewer();
setNode(viewer->getSceneGraph());
@@ -222,7 +222,7 @@ void DlgInspector::on_refreshButton_clicked()
}
}
else {
SceneModel* model = static_cast<SceneModel*>(ui->treeView->model());
auto model = static_cast<SceneModel*>(ui->treeView->model());
model->clear();
}
}