[Libreoffice-commits] core.git: solenv/clang-format vcl/Library_vcl.mk vcl/source

[Chris Sherlock (via logerrit)]

 solenv/clang-format/excludelist |   19 ++++++++++---------
 vcl/Library_vcl.mk              |   18 +++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 3cf6b8b33036a9994bcbb09b006ff9ca574dfaa8
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Sat Dec 19 00:32:40 2020 +1100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Dec 24 09:28:20 2020 +0100

    vcl: move bitmap files from gdi directory to bitmap directory
    
    Change-Id: I9358e2b0fe030d561da6df831c951328b09eab39
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108037
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 292d5abce166..8fed24e6b933 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14895,8 +14895,18 @@ vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
 vcl/source/bitmap/BitmapScaleSuperFilter.cxx
 vcl/source/bitmap/BitmapSymmetryCheck.cxx
 vcl/source/bitmap/BitmapTools.cxx
+vcl/source/bitmap/alpha.cxx
 vcl/source/bitmap/bitmap.cxx
+vcl/source/bitmap/bitmap3.cxx
+vcl/source/bitmap/BitmapEx.cxx
+vcl/source/bitmap/bmpacc.cxx
+vcl/source/bitmap/bmpacc2.cxx
+vcl/source/bitmap/bmpfast.cxx
 vcl/source/bitmap/checksum.cxx
+vcl/source/bitmap/dibtools.cxx
+vcl/source/bitmap/floyd.hxx
+vcl/source/bitmap/impvect.cxx
+vcl/source/bitmap/impvect.hxx
 vcl/source/bitmap/salbmp.cxx
 vcl/source/cnttype/mcnttfactory.cxx
 vcl/source/cnttype/mcnttfactory.hxx
@@ -15002,17 +15012,9 @@ vcl/source/fontsubset/ttcr.hxx
 vcl/source/fontsubset/xlat.cxx
 vcl/source/gdi/CommonSalLayout.cxx
 vcl/source/gdi/VerticalOrientationData.cxx
-vcl/source/gdi/alpha.cxx
-vcl/source/gdi/bitmap3.cxx
-vcl/source/gdi/bitmapex.cxx
-vcl/source/gdi/bmpacc.cxx
-vcl/source/gdi/bmpacc2.cxx
-vcl/source/gdi/bmpfast.cxx
 vcl/source/gdi/configsettings.cxx
 vcl/source/gdi/cvtgrf.cxx
-vcl/source/gdi/dibtools.cxx
 vcl/source/gdi/embeddedfontshelper.cxx
-vcl/source/gdi/floyd.hxx
 vcl/source/gdi/gdimetafiletools.cxx
 vcl/source/gdi/gdimtf.cxx
 vcl/source/gdi/gfxlink.cxx
@@ -15022,7 +15024,6 @@ vcl/source/gdi/graphictools.cxx
 vcl/source/gdi/hatch.cxx
 vcl/source/gdi/impanmvw.cxx
 vcl/source/gdi/impgraph.cxx
-vcl/source/gdi/impvect.cxx
 vcl/source/gdi/impvect.hxx
 vcl/source/gdi/jobset.cxx
 vcl/source/gdi/lineinfo.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ff8c4182af2f..9ac604a3d1d3 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -267,17 +267,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/treelist/svimpbox \
     vcl/source/treelist/svlbitm \
     vcl/source/treelist/uiobject \
-    vcl/source/gdi/alpha \
-    vcl/source/gdi/bitmap3 \
-    vcl/source/gdi/bitmapex \
-    vcl/source/gdi/bmpacc2 \
-    vcl/source/gdi/bmpacc3 \
-    vcl/source/gdi/bmpacc \
-    vcl/source/gdi/bmpfast \
     vcl/source/gdi/configsettings \
     vcl/source/gdi/cvtgrf \
     vcl/source/gdi/svmconverter \
-    vcl/source/gdi/dibtools \
     vcl/source/gdi/embeddedfontshelper \
     vcl/source/gdi/FileDefinitionWidgetDraw \
     vcl/source/gdi/WidgetDefinitionReader \
@@ -294,7 +286,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/gdi/impanmvw \
     vcl/source/gdi/impglyphitem \
     vcl/source/gdi/impgraph \
-    vcl/source/gdi/impvect \
     vcl/source/gdi/jobset \
     vcl/source/gdi/lineinfo \
     vcl/source/gdi/mapmod \
@@ -343,7 +334,16 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/graphic/UnoGraphicProvider \
     vcl/source/graphic/UnoGraphicTransformer \
     vcl/source/graphic/VectorGraphicSearch \
+    vcl/source/bitmap/impvect \
     vcl/source/bitmap/bitmap \
+    vcl/source/bitmap/bitmap3 \
+    vcl/source/bitmap/BitmapEx \
+    vcl/source/bitmap/alpha \
+    vcl/source/bitmap/dibtools \
+    vcl/source/bitmap/bmpacc2 \
+    vcl/source/bitmap/bmpacc3 \
+    vcl/source/bitmap/bmpacc \
+    vcl/source/bitmap/bmpfast \
     vcl/source/bitmap/bitmapfilter \
     vcl/source/bitmap/BitmapAlphaClampFilter \
     vcl/source/bitmap/BitmapBasicMorphologyFilter \
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/bitmap/BitmapEx.cxx
similarity index 100%
rename from vcl/source/gdi/bitmapex.cxx
rename to vcl/source/bitmap/BitmapEx.cxx
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/bitmap/alpha.cxx
similarity index 100%
rename from vcl/source/gdi/alpha.cxx
rename to vcl/source/bitmap/alpha.cxx
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/bitmap/bitmap3.cxx
similarity index 100%
rename from vcl/source/gdi/bitmap3.cxx
rename to vcl/source/bitmap/bitmap3.cxx
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/bitmap/bmpacc.cxx
similarity index 100%
rename from vcl/source/gdi/bmpacc.cxx
rename to vcl/source/bitmap/bmpacc.cxx
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/bitmap/bmpacc2.cxx
similarity index 100%
rename from vcl/source/gdi/bmpacc2.cxx
rename to vcl/source/bitmap/bmpacc2.cxx
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/bitmap/bmpacc3.cxx
similarity index 100%
rename from vcl/source/gdi/bmpacc3.cxx
rename to vcl/source/bitmap/bmpacc3.cxx
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/bitmap/bmpfast.cxx
similarity index 100%
rename from vcl/source/gdi/bmpfast.cxx
rename to vcl/source/bitmap/bmpfast.cxx
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
similarity index 100%
rename from vcl/source/gdi/dibtools.cxx
rename to vcl/source/bitmap/dibtools.cxx
diff --git a/vcl/source/gdi/floyd.hxx b/vcl/source/bitmap/floyd.hxx
similarity index 100%
rename from vcl/source/gdi/floyd.hxx
rename to vcl/source/bitmap/floyd.hxx
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/bitmap/impvect.cxx
similarity index 100%
rename from vcl/source/gdi/impvect.cxx
rename to vcl/source/bitmap/impvect.cxx
diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/bitmap/impvect.hxx
similarity index 100%
rename from vcl/source/gdi/impvect.hxx
rename to vcl/source/bitmap/impvect.hxx