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 d7792826b4
commit 75acacd1b7
175 changed files with 2051 additions and 2057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Gui/NaviCube.cpp
View File

@@ -420,7 +420,7 @@ GLuint NaviCubeImplementation::createCubeFaceTex(QtGLWidget* gl, float gap, cons
paint.end();
Q_UNUSED(gl);
QOpenGLTexture* texture = new QOpenGLTexture(image.mirrored());
auto texture = new QOpenGLTexture(image.mirrored());
m_glTextures.push_back(texture);
texture->generateMipMaps();
texture->setMinificationFilter(QOpenGLTexture::LinearMipMapLinear);
@@ -526,7 +526,7 @@ GLuint NaviCubeImplementation::createButtonTex(QtGLWidget* gl, int button) {
//image.save(str(enum2str(button))+str(".png"));
Q_UNUSED(gl);
QOpenGLTexture* texture = new QOpenGLTexture(image.mirrored());
auto texture = new QOpenGLTexture(image.mirrored());
m_glTextures.push_back(texture);
texture->generateMipMaps();
texture->setMinificationFilter(QOpenGLTexture::LinearMipMapLinear);
@@ -599,7 +599,7 @@ GLuint NaviCubeImplementation::createMenuTex(QtGLWidget* gl, bool forPicking) {
}
painter.end();
Q_UNUSED(gl);
QOpenGLTexture* texture = new QOpenGLTexture(image.mirrored());
auto texture = new QOpenGLTexture(image.mirrored());
m_glTextures.push_back(texture);
texture->generateMipMaps();
texture->setMinificationFilter(QOpenGLTexture::LinearMipMapLinear);
@@ -852,8 +852,8 @@ void NaviCubeImplementation::createContextMenu(const std::vector<std::string>& c
CommandManager& rcCmdMgr = Application::Instance->commandManager();
m_Menu->clear();
for (vector<string>::const_iterator i = cmd.begin(); i != cmd.end(); i++) {
Command* cmd = rcCmdMgr.getCommandByName(i->c_str());
for (const auto & i : cmd) {
Command* cmd = rcCmdMgr.getCommandByName(i.c_str());
if (cmd)
cmd->addTo(m_Menu);
}
@@ -902,7 +902,7 @@ void NaviCubeImplementation::drawNaviCube(bool pickMode) {
// initializes stuff here when we actually have a context
// FIXME actually now that we have Qt5, we could probably do this earlier (as we do not need the opengl context)
if (!m_NaviCubeInitialised) {
QtGLWidget* gl = static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport());
auto gl = static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport());
if (!gl)
return;
initNaviCube(gl);
@@ -1662,7 +1662,7 @@ bool NaviCubeImplementation::processSoEvent(const SoEvent* ev) {
// y += 4;
// x -= 2;
if (ev->getTypeId().isDerivedFrom(SoMouseButtonEvent::getClassTypeId())) {
const SoMouseButtonEvent* mbev = static_cast<const SoMouseButtonEvent*>(ev);
const auto mbev = static_cast<const SoMouseButtonEvent*>(ev);
if (mbev->isButtonPressEvent(mbev, SoMouseButtonEvent::BUTTON1))
return mousePressed(x, y);
if (mbev->isButtonReleaseEvent(mbev, SoMouseButtonEvent::BUTTON1))
@@ -1774,7 +1774,7 @@ void ViewZoomToFitCmd::activated(int iMsg)
QMenu* NaviCubeImplementation::createNaviCubeMenu() {
QMenu* menu = new QMenu(getMainWindow());
auto menu = new QMenu(getMainWindow());
menu->setObjectName(str("NaviCube_Menu"));
CommandManager& rcCmdMgr = Application::Instance->commandManager();
@@ -1796,12 +1796,12 @@ QMenu* NaviCubeImplementation::createNaviCubeMenu() {
commands.emplace_back("ViewZoomToFit");
}
for (vector<string>::iterator i = commands.begin(); i != commands.end(); ++i) {
if (*i == "Separator") {
for (const auto & command : commands) {
if (command == "Separator") {
menu->addSeparator();
}
else {
Command* cmd = rcCmdMgr.getCommandByName(i->c_str());
Command* cmd = rcCmdMgr.getCommandByName(command.c_str());
if (cmd)
cmd->addTo(menu);
}