summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabdulwd <abdulwd97@gmail.com>2016-12-27 12:22:43 +0530
committerTor Lillqvist <tml@collabora.com>2016-12-27 10:53:16 +0000
commite61fe745d12055ee3915a957714772eeb46fdcd3 (patch)
treed27570f53f4919ddb3f41861b39105b3360916ae
parentae02f60cc0fb8a44addcc95d50142a57d3b8a48e (diff)
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 <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--vcl/inc/BitmapProcessor.hxx (renamed from include/vcl/BitmapProcessor.hxx)6
-rw-r--r--vcl/source/bitmap/BitmapProcessor.cxx3
-rw-r--r--vcl/source/image/Image.cxx2
-rw-r--r--vcl/source/image/ImageArrayData.cxx2
-rw-r--r--vcl/source/image/ImplImageTree.cxx3
5 files changed, 9 insertions, 7 deletions
diff --git a/include/vcl/BitmapProcessor.hxx b/vcl/inc/BitmapProcessor.hxx
index 0f0f13869d3f..8c07188ba19b 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 b3cdf86783d0..371d71523de8 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 51dcca4ed94e..e4dde10e4d5c 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 543543804a70..e1854d2aa55a 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 8e34ff6cb56b..a8127a85a0a8 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");