From 28726190d52b0729339d7257b84b449fafa4c34e Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Thu, 6 Dec 2018 00:17:03 +0100
Subject: find-unneeded-includes: Avoid proposing o3tl fw declaration

This does not really work: even when it seems to, it compiles only
because of transitive includes

- Filter o3tl/typed_flags_set.hxx in f-u-u
- Remove already added fw declarations from hxx files and
  include full header just in case
- Remove now unnecessary blacklist entries

Change-Id: Ie0de6667af697095a623b435806449e7e28a6004
Reviewed-on: https://gerrit.libreoffice.org/64659
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 include/vcl/GraphicObject.hxx | 2 +-
 include/vcl/decoview.hxx      | 3 +--
 include/vcl/floatwin.hxx      | 3 +--
 include/vcl/graphicfilter.hxx | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'include/vcl')

diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index 9ffbd9a73ba2..bd5bcd71f1c3 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -23,9 +23,9 @@
 #include <memory>
 #include <vcl/graph.hxx>
 #include <vcl/dllapi.h>
+#include <o3tl/typed_flags_set.hxx>
 
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
-namespace o3tl { template <typename T> struct typed_flags; }
 
 // Adjustment defines
 enum class GraphicAdjustmentFlags
diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index eccdb084a776..3a186b4cecf9 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -24,13 +24,12 @@
 #include <vcl/outdev.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclenum.hxx>
+#include <o3tl/typed_flags_set.hxx>
 
 namespace tools { class Rectangle; }
 class Point;
 class Color;
 
-namespace o3tl { template <typename T> struct typed_flags; }
-
 // Flags for DrawSymbol()
 enum class DrawSymbolFlags
 {
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 10b45c8e5fb4..a9ac32958110 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -23,8 +23,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/syswin.hxx>
 #include <memory>
-
-namespace o3tl { template <typename T> struct typed_flags; }
+#include <o3tl/typed_flags_set.hxx>
 
 class ToolBox;
 
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 0ce9f50ba0c4..b79cb18f9deb 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -24,12 +24,12 @@
 #include <vcl/dllapi.h>
 #include <vcl/graph.hxx>
 #include <vcl/errcode.hxx>
+#include <o3tl/typed_flags_set.hxx>
 
 #include <memory>
 
 namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
 namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
-namespace o3tl { template <typename T> struct typed_flags; }
 
 class INetURLObject;
 
-- 
cgit