summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--solenv/clang-format/blacklist2
-rw-r--r--vcl/inc/opengl/gdiimpl.hxx (renamed from vcl/inc/openglgdiimpl.hxx)12
-rw-r--r--vcl/inc/opengl/win/gdiimpl.hxx2
-rw-r--r--vcl/inc/opengl/x11/gdiimpl.hxx2
-rw-r--r--vcl/opengl/gdiimpl.cxx2
-rw-r--r--vcl/source/gdi/salgdilayout.cxx2
-rw-r--r--vcl/unx/generic/gdi/openglx11cairotextrender.cxx2
-rw-r--r--vcl/workben/vcldemo.cxx2
8 files changed, 13 insertions, 13 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index ea4921c7c974..2e6c918d56cc 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17342,6 +17342,7 @@ vcl/inc/opengl/RenderList.hxx
vcl/inc/opengl/RenderState.hxx
vcl/inc/opengl/TextureState.hxx
vcl/inc/opengl/VertexUtils.hxx
+vcl/inc/opengl/gdiimpl.hxx
vcl/inc/opengl/framebuffer.hxx
vcl/inc/opengl/program.hxx
vcl/inc/opengl/salbmp.hxx
@@ -17355,7 +17356,6 @@ vcl/inc/opengl/x11/gdiimpl.hxx
vcl/inc/opengl/x11/glxtest.hxx
vcl/inc/opengl/x11/salvd.hxx
vcl/inc/opengl/zone.hxx
-vcl/inc/openglgdiimpl.hxx
vcl/inc/osx/a11yfactory.h
vcl/inc/osx/a11yfocustracker.hxx
vcl/inc/osx/a11ylistener.hxx
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/opengl/gdiimpl.hxx
index b5be8792a982..e90e55458d12 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/opengl/gdiimpl.hxx
@@ -23,12 +23,12 @@
#include <vcl/dllapi.h>
#include <vcl/opengl/OpenGLContext.hxx>
-#include "regionband.hxx"
-#include "salgeom.hxx"
-#include "salgdiimpl.hxx"
-#include "opengl/program.hxx"
-#include "opengl/texture.hxx"
-#include "opengl/RenderList.hxx"
+#include <regionband.hxx>
+#include <salgeom.hxx>
+#include <salgdiimpl.hxx>
+#include <opengl/program.hxx>
+#include <opengl/texture.hxx>
+#include <opengl/RenderList.hxx>
#include <memory>
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index bd0bea4ef246..6382e0441bdb 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -13,7 +13,7 @@
#include <memory>
#include <vcl/dllapi.h>
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
#include <svdata.hxx>
#include <win/salgdi.h>
#include <o3tl/lru_map.hxx>
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index bff6f4881629..170ea540a7f3 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -14,7 +14,7 @@
#include <unx/salgdi.h>
#include <unx/x11/x11gdiimpl.h>
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
#include <ControlCacheKey.hxx>
struct TextureCombo;
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index d7187c9921cc..dc007a537c65 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
#include <opengl/framebuffer.hxx>
#include <vcl/gradient.hxx>
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 22a0fb9c7137..c28912ff9905 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -21,7 +21,7 @@
#include <config_features.h>
#include <sal/log.hxx>
#if HAVE_FEATURE_OPENGL
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
#include <opengl/zone.hxx>
#include <desktop/exithelper.h>
#ifdef _WIN32
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
index d1301f1cc2ff..436120b8b0c6 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -9,7 +9,7 @@
#include "openglx11cairotextrender.hxx"
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
#include <salbmp.hxx>
#include <vcl/salbtype.hxx>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 9043672fa179..1d733c55a621 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -60,7 +60,7 @@
#if HAVE_FEATURE_OPENGL
#include <salgdi.hxx>
#include <salframe.hxx>
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
#include <opengl/texture.hxx>
#include <opengl/framebuffer.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>