Make Color a forward declaration

Change-Id: Ib28833555661b119de8e967b05e3c8691fca826a
Reviewed-on: https://gerrit.libreoffice.org/43227
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

7 files changed, 8 insertions, 6 deletions

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 0be13c12bf3e..e0d92edfd462 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_BITMAP_HXX
 #define INCLUDED_VCL_BITMAP_HXX
 
-#include <tools/color.hxx>
 #include <tools/link.hxx>
 #include <tools/solar.h>
 #include <vcl/checksum.hxx>
@@ -30,6 +29,8 @@
 #include <vcl/scopedbitmapaccess.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
+class Color;
+
 enum class BmpMirrorFlags
 {
     NONE             = 0x00,
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 3ec0d467bf85..60a2aaff7249 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_BUTTON_HXX
 
 #include <tools/solar.h>
-#include <tools/color.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/image.hxx>
 #include <vcl/ctrl.hxx>
@@ -34,6 +33,7 @@
 
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
 
+class Color;
 class UserDrawEvent;
 class ImplCommonButtonData;
 enum class DrawButtonFlags;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 680ccd9d5af2..669271494f4c 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -22,7 +22,6 @@
 
 #include <memory>
 #include <vcl/vclenum.hxx>
-#include <tools/color.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/bitmapex.hxx>
diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index 8e2236bb34ae..94cf877e03d0 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -27,10 +27,11 @@
 
 #include <tools/solar.h>
 #include <tools/gen.hxx>
-#include <tools/color.hxx>
 #include <tools/fontenum.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
+class Color;
+
 // Flags for OutputDevice::Push() and OutDevState
 enum class PushFlags {
     NONE            = 0x0000,
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 97b0b213ba11..97ca0cf98493 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -23,8 +23,8 @@
 #include <tools/debug.hxx>
 #include <vcl/checksum.hxx>
 #include <vcl/salgtype.hxx>
-#include <tools/color.hxx>
 #include <tools/helpers.hxx>
+#include <tools/color.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 1596e0094c7b..c4e70d56d06e 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -31,6 +31,7 @@
 #include <tools/lineend.hxx>
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
+#include <tools/color.hxx>
 #include <vcl/font.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index d63fabf83e1d..c68bbf31ac10 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_VCL_WALL_HXX
 #define INCLUDED_VCL_WALL_HXX
 
-#include <tools/color.hxx>
 #include <tools/gen.hxx>
 #include <vcl/dllapi.h>
 #include <o3tl/cow_wrapper.hxx>
 
+class Color;
 class Gradient;
 class BitmapEx;
 class ImplWallpaper;