canvas/inc/pch/precompiled_oglcanvas.hxx | 3 ++-
canvas/source/opengl/ogl_canvascustomsprite.cxx | 1 +
canvas/source/opengl/ogl_spritecanvas.cxx | 1 +
include/vcl/opengl/OpenGLContext.hxx | 13 ++++++++-----
slideshow/source/engine/opengl/TransitionerImpl.cxx | 1 +
vcl/source/opengl/win/context.cxx | 1 +
vcl/source/opengl/x11/context.cxx | 1 +
7 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 98f125ecbb2a80c34213f7e86a417f74ee7e13a1
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Aug 7 20:45:03 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Aug 8 17:12:12 2021 +0200
use some forward declares
Change-Id: If7f726e8dddb63c8a566f9aa208cd317213d5eba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120166
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/canvas/inc/pch/precompiled_oglcanvas.hxx
b/canvas/inc/pch/precompiled_oglcanvas.hxx
index 91336db7a7d8..4ea5dc2cc7f5 100644
--- a/canvas/inc/pch/precompiled_oglcanvas.hxx
+++ b/canvas/inc/pch/precompiled_oglcanvas.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which
presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2021-03-08 13:11:35 using:
+ Generated on 2021-08-07 20:44:40 using:
./bin/update_pch canvas oglcanvas --cutoff=1 --exclude:system
--include:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -36,6 +36,7 @@
#include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/syschild.hxx>
#include <vcl/virdev.hxx>
+#include <vcl/window.hxx>
#endif // PCH_LEVEL >= 2
#if PCH_LEVEL >= 3
#include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx
b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index d15de6b31c0d..dcc0c15108cf 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -13,6 +13,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolygontriangulator.hxx>
#include <basegfx/utils/canvastools.hxx>
#include <canvas/canvastools.hxx>
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx
b/canvas/source/opengl/ogl_spritecanvas.cxx
index babeafa19af9..047627dbffd4 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -15,6 +15,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/opengl/OpenGLHelper.hxx>
+#include <vcl/window.hxx>
#include "ogl_canvascustomsprite.hxx"
#include "ogl_spritecanvas.hxx"
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 10a62f21bfb8..3c48d3687571 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -7,13 +7,18 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_OPENGL_OPENGLCONTEXT_HXX
-#define INCLUDED_VCL_OPENGL_OPENGLCONTEXT_HXX
+#pragma once
#include <vcl/dllapi.h>
-#include <vcl/syschild.hxx>
+#include <vcl/sysdata.hxx>
+#include <vcl/vclptr.hxx>
#include <rtl/ref.hxx>
+class Point;
+class Size;
+class SystemChildWindow;
+namespace vcl { class Window; }
+
/// Holds the information of our new child window
struct VCL_DLLPUBLIC GLWindow
{
@@ -114,6 +119,4 @@ public:
OpenGLContext *mpNextContext;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx
b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index bf8c23744fc3..3bba744a7fb0 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -61,6 +61,7 @@
#include <vcl/canvastools.hxx>
#include <vcl/opengl/OpenGLContext.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
+#include <vcl/syschild.hxx>
#include <vcl/window.hxx>
#include "TransitionImpl.hxx"
diff --git a/vcl/source/opengl/win/context.cxx
b/vcl/source/opengl/win/context.cxx
index b9348b8520b3..5031ec6f0049 100644
--- a/vcl/source/opengl/win/context.cxx
+++ b/vcl/source/opengl/win/context.cxx
@@ -12,6 +12,7 @@
#include <thread>
#include <vcl/opengl/OpenGLContext.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
+#include <vcl/syschild.hxx>
#include <sal/log.hxx>
#include <comphelper/windowserrorstring.hxx>
diff --git a/vcl/source/opengl/x11/context.cxx
b/vcl/source/opengl/x11/context.cxx
index f1fc19e5a824..f8a3118e03f4 100644
--- a/vcl/source/opengl/x11/context.cxx
+++ b/vcl/source/opengl/x11/context.cxx
@@ -9,6 +9,7 @@
#include <memory>
#include <vcl/lazydelete.hxx>
+#include <vcl/syschild.hxx>
#include <svdata.hxx>
