diff options
-rw-r--r-- | solenv/clang-format/blacklist | 6 | ||||
-rw-r--r-- | vcl/Library_vcl.mk | 2 | ||||
-rw-r--r-- | vcl/inc/bitmap/Octree.hxx (renamed from vcl/inc/octree.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/bitmap/impoctree.hxx (renamed from vcl/inc/impoctree.hxx) | 2 | ||||
-rw-r--r-- | vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx | 2 | ||||
-rw-r--r-- | vcl/source/bitmap/Octree.cxx (renamed from vcl/source/gdi/octree.cxx) | 4 | ||||
-rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 830cfe7fa9d8..732fc7c40550 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -17331,13 +17331,13 @@ vcl/inc/impfontmetric.hxx vcl/inc/impfontmetricdata.hxx vcl/inc/impgraph.hxx vcl/inc/implimagetree.hxx -vcl/inc/impoctree.hxx vcl/inc/ios/iosinst.hxx vcl/inc/ios/svsys.h vcl/inc/jobset.h vcl/inc/langboost.hxx vcl/inc/listbox.hxx -vcl/inc/octree.hxx +vcl/inc/bitmap/Octree.hxx +vcl/inc/bitmap/impoctree.hxx vcl/inc/opengl/BufferObject.hxx vcl/inc/opengl/DeviceInfo.hxx vcl/inc/opengl/FixedTextureAtlas.hxx @@ -17777,6 +17777,7 @@ vcl/source/bitmap/BitmapTools.cxx vcl/source/bitmap/bitmap.cxx vcl/source/bitmap/bitmapfilter.cxx vcl/source/bitmap/checksum.cxx +vcl/source/bitmap/Octree.cxx vcl/source/components/dtranscomp.cxx vcl/source/components/factory.cxx vcl/source/components/fontident.cxx @@ -17909,7 +17910,6 @@ vcl/source/gdi/lineinfo.cxx vcl/source/gdi/mapmod.cxx vcl/source/gdi/metaact.cxx vcl/source/gdi/mtfxmldump.cxx -vcl/source/gdi/octree.cxx vcl/source/gdi/oldprintadaptor.cxx vcl/source/gdi/pdfextoutdevdata.cxx vcl/source/gdi/pdffontcache.cxx diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 7265eb39811f..242af6a996fb 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -280,7 +280,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/lineinfo \ vcl/source/gdi/mapmod \ vcl/source/gdi/metaact \ - vcl/source/gdi/octree \ vcl/source/gdi/oldprintadaptor \ vcl/source/gdi/pdfbuildin_fonts \ vcl/source/gdi/pdfextoutdevdata \ @@ -344,6 +343,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/bitmap/BitmapSimpleColorQuantizationFilter \ vcl/source/bitmap/BitmapTools \ vcl/source/bitmap/checksum \ + vcl/source/bitmap/Octree \ vcl/source/image/Image \ vcl/source/image/ImageTree \ vcl/source/image/ImageRepository \ diff --git a/vcl/inc/octree.hxx b/vcl/inc/bitmap/Octree.hxx index cec8e4171494..cec8e4171494 100644 --- a/vcl/inc/octree.hxx +++ b/vcl/inc/bitmap/Octree.hxx diff --git a/vcl/inc/impoctree.hxx b/vcl/inc/bitmap/impoctree.hxx index 97de164ed405..b2f05b351c5a 100644 --- a/vcl/inc/impoctree.hxx +++ b/vcl/inc/bitmap/impoctree.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_IMPOCTREE_HXX #define INCLUDED_VCL_INC_IMPOCTREE_HXX -#include "octree.hxx" +#include "Octree.hxx" class ImpErrorQuad { diff --git a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx index 2f1fb9906a1f..ae066cc66cf6 100644 --- a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx +++ b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx @@ -14,7 +14,7 @@ #include <vcl/BitmapSimpleColorQuantizationFilter.hxx> #include <bitmapwriteaccess.hxx> -#include <impoctree.hxx> +#include <bitmap/Octree.hxx> #include <cstdlib> diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/bitmap/Octree.cxx index 4635067901f8..64914f76385e 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/bitmap/Octree.cxx @@ -22,8 +22,8 @@ #include <rtl/alloc.h> #include <vcl/bitmapaccess.hxx> -#include <octree.hxx> -#include <impoctree.hxx> +#include <bitmap/Octree.hxx> +#include <bitmap/impoctree.hxx> static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 23aa996b6a2d..71a3bc468876 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -32,13 +32,13 @@ #endif #include <vcl/BitmapMonochromeFilter.hxx> -#include <impoctree.hxx> #include <BitmapScaleSuperFilter.hxx> #include <BitmapScaleConvolutionFilter.hxx> #include <BitmapFastScaleFilter.hxx> #include <BitmapInterpolateScaleFilter.hxx> #include <bitmapwriteaccess.hxx> -#include <octree.hxx> +#include <bitmap/impoctree.hxx> +#include <bitmap/Octree.hxx> #include <svdata.hxx> #include <salinst.hxx> #include <salbmp.hxx> |