Gui: Remove QtOpenGL.h.

2025-02-24 21:16:27 +00:00
parent 91e94ba1dd
commit 3b05b61de2
27 changed files with 73 additions and 58 deletions
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -36,6 +36,7 @@
 # include <QApplication>
 # include <QFileInfo>
 # include <QMessageBox>
+# include <QOpenGLWidget>
 # include <QTextStream>
 # include <QTimer>
 # include <QStatusBar>
--- a/src/Gui/GLPainter.cpp
+++ b/src/Gui/GLPainter.cpp
@@ -25,6 +25,8 @@
 #ifndef _PreComp_
 #endif

+#include <QOpenGLWidget>
+
 #include "GLPainter.h"
 #include "View3DInventorViewer.h"

--- a/src/Gui/GLPainter.h
+++ b/src/Gui/GLPainter.h
@@ -24,6 +24,18 @@
 #ifndef GUI_GLPAINTER_H
 #define GUI_GLPAINTER_H

+#ifdef FC_OS_WIN32
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#endif
+#ifdef FC_OS_MACOSX
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
+
 #include <Base/BaseClass.h>
 #include <FCGlobal.h>
 #include <QPoint>
@@ -31,12 +43,6 @@
 class QPaintDevice;
 class QOpenGLWidget;

-using GLenum = unsigned int;
-using GLint = int;
-using GLushort = unsigned short;
-using GLfloat = float;
-using GLdouble = double;
-
 namespace Gui {
 class View3DInventorViewer;
 class GuiExport GLPainter
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -40,6 +40,7 @@
 # include <QMenuBar>
 # include <QMessageBox>
 # include <QMimeData>
+# include <QOpenGLWidget>
 # include <QPainter>
 # include <QRegularExpression>
 # include <QRegularExpressionMatch>
--- a/src/Gui/ManualAlignment.cpp
+++ b/src/Gui/ManualAlignment.cpp
@@ -30,6 +30,7 @@
 # include <QMessageBox>
 # include <QPainter>
 # include <QSplitter>
+# include <QSurfaceFormat>
 # include <QTimer>
 # include <QVBoxLayout>
 # include <Inventor/SoPickedPoint.h>
--- a/src/Gui/MouseSelection.cpp
+++ b/src/Gui/MouseSelection.cpp
@@ -23,6 +23,7 @@
 #include "PreCompiled.h"

 #ifndef _PreComp_
+#include <QOpenGLFramebufferObject>
 #include <QPixmap>
 #include <QMenu>
 #include <Inventor/SbBox.h>
--- a/src/Gui/NaviCube.cpp
+++ b/src/Gui/NaviCube.cpp
@@ -41,7 +41,9 @@
 # include <QCursor>
 # include <QImage>
 # include <QMenu>
+# include <QOpenGLFramebufferObject>
 # include <QOpenGLTexture>
+# include <QOpenGLWidget>
 # include <QPainterPath>
 #endif

@@ -705,7 +707,7 @@ void NaviCubeImplementation::prepare()
        delete m_PickingFramebuffer;
    m_PickingFramebuffer =
        new QOpenGLFramebufferObject(2 * m_CubeWidgetSize, 2 * m_CubeWidgetSize,
-                                  QOpenGLFramebufferObject::CombinedDepthStencil);
+                                     QOpenGLFramebufferObject::CombinedDepthStencil);
    m_View3DInventorViewer->getSoRenderManager()->scheduleRedraw();
 }

--- a/src/Gui/Quarter/QuarterWidget.cpp
+++ b/src/Gui/Quarter/QuarterWidget.cpp
@@ -70,6 +70,7 @@
 #include <QMetaObject>
 #include <QOpenGLDebugLogger>
 #include <QOpenGLDebugMessage>
+#include <QOpenGLWidget>
 #include <QPaintEvent>
 #include <QResizeEvent>
 #include <QWindow>
--- a/src/Gui/Quarter/QuarterWidget.h
+++ b/src/Gui/Quarter/QuarterWidget.h
@@ -39,10 +39,12 @@
 #include <QColor>
 #include <QGraphicsView>
 #include <QUrl>
-#include <QtOpenGL.h>

 #include "Basic.h"

+class QOpenGLContext;
+class QOpenGLWidget;
+class QSurfaceFormat;

 class QMenu;
 class SoNode;
--- a/src/Gui/Quarter/QuarterWidgetP.cpp
+++ b/src/Gui/Quarter/QuarterWidgetP.cpp
@@ -42,6 +42,8 @@
 #include <QApplication>
 #include <QCursor>
 #include <QMenu>
+#include <QOpenGLContext>
+#include <QOpenGLWidget>

 #include <Inventor/SoEventManager.h>
 #include <Inventor/actions/SoSearchAction.h>
--- a/src/Gui/Quarter/QuarterWidgetP.h
+++ b/src/Gui/Quarter/QuarterWidgetP.h
@@ -36,8 +36,8 @@
 #include <Inventor/SbBasic.h>
 #include <QList>
 #include <QUrl>
-#include <QtOpenGL.h>

+class QOpenGLWidget;

 class SoNode;
 class SoCamera;
--- a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
+++ b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
@@ -34,11 +34,16 @@
 #include <Inventor/nodes/SoPerspectiveCamera.h>
 #include <Inventor/nodes/SoSeparator.h>

-#if !defined(FC_OS_MACOSX)
+# ifdef FC_OS_WIN32
+#  include <windows.h>
+# endif
+# ifdef FC_OS_MACOSX
+# include <OpenGL/gl.h>
+# else
 # include <GL/gl.h>
-# include <GL/glu.h>
 # include <GL/glext.h>
-#endif
+# include <GL/glu.h>
+# endif

 #include "SoQTQuarterAdaptor.h"

--- a/src/Gui/Quarter/SoQTQuarterAdaptor.h
+++ b/src/Gui/Quarter/SoQTQuarterAdaptor.h
@@ -31,6 +31,9 @@

 #include "QuarterWidget.h"

+class QOpenGLContext;
+class QOpenGLWidget;
+class QSurfaceFormat;

 class SbViewportRegion;
 class SoCamera;
--- a/src/Gui/Selection/SoFCUnifiedSelection.cpp
+++ b/src/Gui/Selection/SoFCUnifiedSelection.cpp
@@ -70,6 +70,8 @@
 # include <GL/gl.h>
 #endif

+#include <QOpenGLWidget>
+
 #include <App/Document.h>
 #include <App/GeoFeature.h>
 #include <App/ElementNamingUtils.h>
--- a/src/Gui/SoFCOffscreenRenderer.cpp
+++ b/src/Gui/SoFCOffscreenRenderer.cpp
@@ -43,6 +43,8 @@
 # include <GL/glext.h>
 #endif

+#include <QOpenGLFramebufferObject>
+#include <QOpenGLContext>
 #include <QOffscreenSurface>

 #include <App/Application.h>
--- a/src/Gui/SoFCOffscreenRenderer.h
+++ b/src/Gui/SoFCOffscreenRenderer.h
@@ -27,12 +27,21 @@
 #include <Inventor/SbMatrix.h>
 #include <Inventor/SoOffscreenRenderer.h>

+#ifdef FC_OS_MACOSX
+# include <OpenGL/gl.h>
+#else
+# ifdef FC_OS_WIN32
+#  include <windows.h>
+# endif  // FC_OS_WIN32
+# include <GL/gl.h>
+#endif  // FC_OS_MACOSX
+
 #include <QImage>
 #include <QStringList>
-#include <QtOpenGL.h>

 #include <FCGlobal.h>

+class QOpenGLFramebufferObject;

 namespace Gui {

--- a/src/Gui/SoTextLabel.cpp
+++ b/src/Gui/SoTextLabel.cpp
@@ -58,8 +58,6 @@
 #include <Inventor/elements/SoGLTexture3EnabledElement.h>
 #endif

-#include <QtOpenGL.h>
-
 #include "SoTextLabel.h"
 #include "SoFCInteractiveElement.h"
 #include "Tools.h"
--- a/src/Gui/SplitView3DInventor.cpp
+++ b/src/Gui/SplitView3DInventor.cpp
@@ -24,6 +24,7 @@

 #ifndef _PreComp_
 # include <QSplitter>
+# include <QSurfaceFormat>
 # include <Inventor/nodes/SoDirectionalLight.h>
 # include <Inventor/nodes/SoOrthographicCamera.h>
 # include <Inventor/nodes/SoPerspectiveCamera.h>
--- a/src/Gui/View3DInventor.h
+++ b/src/Gui/View3DInventor.h
@@ -26,7 +26,6 @@
 #include <memory>
 #include <optional>
 #include <QImage>
-#include <QtOpenGL.h>

 #include <Base/Parameter.h>

@@ -35,6 +34,7 @@
 #include "Base/Vector3D.h"

 class QPrinter;
+class QOpenGLWidget;
 class QStackedWidget;

 namespace Gui {
--- a/src/Gui/View3DInventorViewer.cpp
+++ b/src/Gui/View3DInventorViewer.cpp
@@ -81,6 +81,9 @@
 # include <QKeyEvent>
 # include <QMessageBox>
 # include <QMimeData>
+# include <QOpenGLFramebufferObject>
+# include <QOpenGLWidget>
+# include <QSurfaceFormat>
 # include <QTimer>
 # include <QVariantAnimation>
 # include <QWheelEvent>
--- a/src/Gui/View3DInventorViewer.h
+++ b/src/Gui/View3DInventorViewer.h
@@ -37,6 +37,15 @@
 #include <Inventor/nodes/SoEventCallback.h>
 #include <Inventor/nodes/SoSwitch.h>

+#ifdef FC_OS_MACOSX
+# include <OpenGL/gl.h>
+#else
+# ifdef FC_OS_WIN32
+#  include <windows.h>
+# endif  // FC_OS_WIN32
+# include <GL/gl.h>
+#endif  // FC_OS_MACOSX
+
 #include <Base/Placement.h>

 #include "Namespace.h"
@@ -49,6 +58,9 @@
 #include <Inventor/nodes/SoEnvironment.h>
 #include <Inventor/nodes/SoRotation.h>

+class QOpenGLFramebufferObject;
+class QOpenGLWidget;
+class QSurfaceFormat;

 class SoTranslation;
 class SoTransform;
--- a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp
+++ b/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
-    (void)direct;
    return false;
 #else
    return direct;
--- a/src/Mod/Sandbox/Gui/Overlay.cpp
+++ b/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>
@@ -107,7 +105,7 @@ Teapots(Gui::View3DInventorViewer* v) :view(v)

    rubberBandIsShown = false;
    fbObject = new QOpenGLFramebufferObject(size[0],size[1],
-                                         QOpenGLFramebufferObject::Depth);
+                                            QOpenGLFramebufferObject::Depth);
    resizeGL(size[0],size[1]);

    rubberBandIsShown = true;
--- a/src/Mod/Sandbox/Gui/Overlay.h
+++ b/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>
--- a/src/Mod/Sandbox/Gui/Workbench.cpp
+++ b/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>
--- a/src/Mod/TechDraw/Gui/QGVPage.cpp
+++ b/src/Mod/TechDraw/Gui/QGVPage.cpp
@@ -29,6 +29,7 @@
 #include <QContextMenuEvent>
 #include <QLabel>
 #include <QMouseEvent>
+#include <QOpenGLWidget>
 #include <QPaintEvent>
 #include <QPainter>
 #include <QScrollBar>
--- a/src/QtOpenGL.h
+++ b/src/QtOpenGL.h
@@ -1,34 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2017 Werner Mayer <wmayer[at]users.sourceforge.net>     *
- *                                                                         *
- *   This file is part of the FreeCAD CAx development system.              *
- *                                                                         *
- *   This library is free software; you can redistribute it and/or         *
- *   modify it under the terms of the GNU Library General Public           *
- *   License as published by the Free Software Foundation; either          *
- *   version 2 of the License, or (at your option) any later version.      *
- *                                                                         *
- *   This library  is distributed in the hope that it will be useful,      *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Library General Public License for more details.                  *
- *                                                                         *
- *   You should have received a copy of the GNU Library General Public     *
- *   License along with this library; see the file COPYING.LIB. If not,    *
- *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
- *   Suite 330, Boston, MA  02111-1307, USA                                *
- *                                                                         *
- ***************************************************************************/
-
-
-#ifndef QUARTER_QTOPENGL_H
-#define QUARTER_QTOPENGL_H
-
-#include <QOpenGLContext>
-#include <QSurfaceFormat>
-#include <QOpenGLWidget>
-#include <QOpenGLFramebufferObject>
-#include <QOpenGLVersionProfile>
-#include <QOpenGLFunctions>
-
-#endif //QUARTER_QTOPENGL_H