Skip to content

Commit

Permalink
Remove unused ifndefs for GL_MULTISAMPLE
Browse files Browse the repository at this point in the history
(found while searching for the build error on armhf/armel on Debian
buildds, once resolved will make an additional PR for that.)

$grep -r GL_MULTISAMPLE src/
yields:

 src/Mod/Sandbox/Gui/Overlay.cpp: #ifndef GL_MULTISAMPLE
 src/Mod/Sandbox/Gui/Overlay.cpp: #define GL_MULTISAMPLE  0x809D
 src/Mod/Sandbox/Gui/GLGraphicsView.cpp:#ifndef GL_MULTISAMPLE
 src/Mod/Sandbox/Gui/GLGraphicsView.cpp:#define GL_MULTISAMPLE  0x809D

-> The defines are defined, but never used in the compilation unit
  • Loading branch information
Tobias Frost authored and wwmayer committed Dec 24, 2024
1 parent abb50a4 commit 7fb8044
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
4 changes: 0 additions & 4 deletions src/Mod/Sandbox/Gui/GLGraphicsView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@

using namespace Gui;

Check warning on line 67 in src/Mod/Sandbox/Gui/GLGraphicsView.cpp

View workflow job for this annotation

GitHub Actions / Lint / Lint

Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5]

#ifndef GL_MULTISAMPLE
#define GL_MULTISAMPLE 0x809D
#endif

// http://doc.qt.digia.com/qq/qq26-openglcanvas.html

GraphicsView::GraphicsView()

Check warning on line 71 in src/Mod/Sandbox/Gui/GLGraphicsView.cpp

View workflow job for this annotation

GitHub Actions / Lint / Lint

use '= default' to define a trivial default constructor [modernize-use-equals-default]
Expand Down
3 changes: 0 additions & 3 deletions src/Mod/Sandbox/Gui/Overlay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ class MyPaintable : public Gui::GLGraphicsItem

view->getSoRenderManager()->scheduleRedraw();
}
#ifndef GL_MULTISAMPLE
#define GL_MULTISAMPLE 0x809D
#endif
void paintGL()
{
const SbViewportRegion vp = view->getSoRenderManager()->getViewportRegion();
Expand Down

0 comments on commit 7fb8044

Please sign in to comment.