Merge pull request #19626 from tritao/qt-gl-cleanup

Gui: Remove QtOpenGL.h.

src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp

@@ -411,10 +411,9 @@ bool MeshRenderer::matchMaterial(SoState* state) const
     return p->pcolors == pcolors;
 }
 
-bool MeshRenderer::shouldRenderDirectly(bool direct)
+bool MeshRenderer::shouldRenderDirectly([[maybe_unused]] bool direct)
 {
 #ifdef RENDER_GL_VAO
-    Q_UNUSED(direct);
     return false;
 #else
     return direct;
@@ -754,7 +753,7 @@ void SoFCIndexedFaceSet::generateGLArrays(SoGLRenderAction* action)
         numcolors = gl->getNumDiffuse();
         transp = gl->getTransparencyPointer();
         numtransp = gl->getNumTransparencies();
-        Q_UNUSED(numtransp);
+        (void)numtransp;
     }
 
     std::vector<float> face_vertices;

src/Mod/Sandbox/Gui/Overlay.cpp

@@ -30,8 +30,6 @@
 # include <Inventor/nodes/SoImage.h>
 #endif
 
-#include <QtOpenGL.h>
-
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection/Selection.h>
@@ -47,7 +45,7 @@ using namespace SandboxGui;
 
 class MyPaintable : public Gui::GLGraphicsItem
 {
-    QtGLFramebufferObject* fbo;
+    QOpenGLFramebufferObject* fbo;
     Gui::View3DInventorViewer* view;
     QImage img;
 public:
@@ -63,7 +61,7 @@ public:
             p.drawText(200,200,QStringLiteral("Render to QImage"));
         }
 
-        fbo = new QtGLFramebufferObject(v->getGLWidget()->size());
+        fbo = new QOpenGLFramebufferObject(v->getGLWidget()->size());
         fbo->bind();
         fbo->release();
 
@@ -92,7 +90,7 @@ public:
 
 class Teapots : public Gui::GLGraphicsItem
 {
-    QtGLFramebufferObject *fbObject;
+    QOpenGLFramebufferObject *fbObject;
     GLuint glTeapotObject;
     QPoint rubberBandCorner1;
     QPoint rubberBandCorner2;
@@ -106,8 +104,8 @@ Teapots(Gui::View3DInventorViewer* v) :view(v)
     SbVec2s size = vp.getViewportSizePixels();
 
     rubberBandIsShown = false;
-    fbObject = new QtGLFramebufferObject(size[0],size[1],
-                                         QtGLFramebufferObject::Depth);
+    fbObject = new QOpenGLFramebufferObject(size[0],size[1],
+                                            QOpenGLFramebufferObject::Depth);
     resizeGL(size[0],size[1]);
 
     rubberBandIsShown = true;
@@ -332,7 +330,7 @@ DrawingPlane::~DrawingPlane()
 
 void DrawingPlane::initialize()
 {
-    fbo = new QtGLFramebufferObject(128, 128,QtGLFramebufferObject::Depth);
+    fbo = new QOpenGLFramebufferObject(128, 128,QOpenGLFramebufferObject::Depth);
 }
 
 void DrawingPlane::terminate()
@@ -353,7 +351,7 @@ void DrawingPlane::draw ()
 {return;
     if (1/*mustRedraw*/) {
         SbVec2s view = _pcView3D->getSoRenderManager()->getSize();
-        static_cast<QtGLWidget*>(_pcView3D->getGLWidget())->makeCurrent();
+        static_cast<QOpenGLWidget*>(_pcView3D->getGLWidget())->makeCurrent();
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
     glLoadIdentity();

src/Mod/Sandbox/Gui/Overlay.h

@@ -24,7 +24,6 @@
 #ifndef SANDBOXGUI_OVERLAY_H
 #define SANDBOXGUI_OVERLAY_H
 
-#include <QtOpenGL.h>
 #include <Gui/MouseSelection.h>
 #include <QColor>
 #include <QPoint>
@@ -55,7 +54,7 @@ private:
     QPoint lastPoint;
     QList<QPoint> selection;
 
-    QtGLFramebufferObject* fbo;
+    QOpenGLFramebufferObject* fbo;
 };
 
 } // SandboxGui

src/Mod/Sandbox/Gui/Workbench.cpp

@@ -34,8 +34,6 @@
 # include <Inventor/SbLinear.h>
 #endif
 
-#include <QtOpenGL.h>
-
 #include "Workbench.h"
 #include <App/Application.h>
 #include <Gui/MenuManager.h>

src/Mod/TechDraw/Gui/QGVPage.cpp

@@ -29,6 +29,7 @@
 #include <QContextMenuEvent>
 #include <QLabel>
 #include <QMouseEvent>
+#include <QOpenGLWidget>
 #include <QPaintEvent>
 #include <QPainter>
 #include <QScrollBar>