include/vcl/BitmapProcessor.hxx | 25 ------------------------- vcl/inc/BitmapProcessor.hxx | 25 +++++++++++++++++++++++++ vcl/source/bitmap/BitmapProcessor.cxx | 3 ++- vcl/source/image/Image.cxx | 2 +- vcl/source/image/ImageArrayData.cxx | 2 +- vcl/source/image/ImplImageTree.cxx | 3 ++- 6 files changed, 31 insertions(+), 29 deletions(-)
New commits: commit e61fe745d12055ee3915a957714772eeb46fdcd3 Author: abdulwd <abdulw...@gmail.com> Date: Tue Dec 27 12:22:43 2016 +0530 tdf#97228 Move include file include/vcl/BitmapProcessor.hxx to vcl/inc/ Adapt users, all in vcl, accordingly. Change-Id: I4531840091da73fa8fc29175407fa8a737deac18 Reviewed-on: https://gerrit.libreoffice.org/32442 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/include/vcl/BitmapProcessor.hxx b/vcl/inc/BitmapProcessor.hxx similarity index 83% rename from include/vcl/BitmapProcessor.hxx rename to vcl/inc/BitmapProcessor.hxx index 0f0f138..8c07188 100644 --- a/include/vcl/BitmapProcessor.hxx +++ b/vcl/inc/BitmapProcessor.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_VCL_BITMAP_PROCESSOR_HXX -#define INCLUDED_VCL_BITMAP_PROCESSOR_HXX +#ifndef VCL_INC_BITMAP_PROCESSOR_HXX +#define VCL_INC_BITMAP_PROCESSOR_HXX #include <vcl/bitmapex.hxx> @@ -20,6 +20,6 @@ public: static void colorizeImage(BitmapEx& rBitmapEx, Color aColor); }; -#endif // INCLUDED_VCL_BITMAP_PROCESSOR_HXX +#endif // VCL_INC_BITMAP_PROCESSOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/bitmap/BitmapProcessor.cxx b/vcl/source/bitmap/BitmapProcessor.cxx index b3cdf86..371d715 100644 --- a/vcl/source/bitmap/BitmapProcessor.cxx +++ b/vcl/source/bitmap/BitmapProcessor.cxx @@ -8,10 +8,11 @@ * */ -#include <vcl/BitmapProcessor.hxx> #include <vcl/bitmapaccess.hxx> #include <basegfx/color/bcolortools.hxx> +#include "BitmapProcessor.hxx" + BitmapEx BitmapProcessor::createLightImage(const BitmapEx& rBitmapEx) { const Size aSize(rBitmapEx.GetSizePixel()); diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index 51dcca4..e4dde10 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -34,7 +34,7 @@ #include <sal/types.h> #include <image.h> -#include <vcl/BitmapProcessor.hxx> +#include "BitmapProcessor.hxx" #if OSL_DEBUG_LEVEL > 0 #include <rtl/strbuf.hxx> diff --git a/vcl/source/image/ImageArrayData.cxx b/vcl/source/image/ImageArrayData.cxx index 5435438..e1854d2 100644 --- a/vcl/source/image/ImageArrayData.cxx +++ b/vcl/source/image/ImageArrayData.cxx @@ -35,7 +35,7 @@ #include <rtl/strbuf.hxx> #endif -#include <vcl/BitmapProcessor.hxx> +#include "BitmapProcessor.hxx" ImageAryData::ImageAryData( const ImageAryData& rData ) : maName( rData.maName ), diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 8e34ff6..a8127a8 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -45,10 +45,11 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <vcl/BitmapProcessor.hxx> #include <vcl/BitmapTools.hxx> #include <vcl/pngwrite.hxx> +#include "BitmapProcessor.hxx" + bool ImageRequestParameters::convertToDarkTheme() { static bool bIconsForDarkTheme = !!getenv("VCL_ICONS_FOR_DARK_THEME"); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits