From 4f2cf88979e8c5dc97f5fde233ea4d6d128c1787 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Tue, 3 Mar 2020 23:40:31 +0100 Subject: tdf#42949 Fix IWYU warnings in libreofficekit/ Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ic57b1259e612cc38ad22f123edbaca690cd506ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89937 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- libreofficekit/IwyuFilter_libreofficekit.yaml | 2 ++ libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx | 1 - libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx | 1 - libreofficekit/qa/gtktiledviewer/gtv-application.cxx | 2 ++ libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx | 7 +------ libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.hxx | 2 +- libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx | 5 ++--- libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx | 3 +++ libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx | 5 ++--- libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx | 7 ------- .../qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx | 4 ---- .../qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx | 1 + libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx | 8 +++----- libreofficekit/qa/gtktiledviewer/gtv-main.cxx | 2 +- libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx | 4 ++-- libreofficekit/qa/tilebench/tilebench.cxx | 3 --- libreofficekit/source/gtk/tilebuffer.hxx | 10 ++++------ 17 files changed, 24 insertions(+), 43 deletions(-) create mode 100644 libreofficekit/IwyuFilter_libreofficekit.yaml (limited to 'libreofficekit') diff --git a/libreofficekit/IwyuFilter_libreofficekit.yaml b/libreofficekit/IwyuFilter_libreofficekit.yaml new file mode 100644 index 000000000000..128f5a357fd9 --- /dev/null +++ b/libreofficekit/IwyuFilter_libreofficekit.yaml @@ -0,0 +1,2 @@ +--- +assumeFilename: libreofficekit/source/gtk/lokdocview.cxx diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx index 2ebaf0e49aec..4d2dbd41f251 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx @@ -24,7 +24,6 @@ #include "gtv-lok-dialog.hxx" #include -#include namespace { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx index 21508097e077..9d3d519627cd 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx @@ -12,7 +12,6 @@ #include -#include #include #include "gtv-main-toolbar.hxx" diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx index fcbd57dda73e..8b54b7f951f9 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx @@ -12,6 +12,8 @@ #include "gtv-application.hxx" #include "gtv-application-window.hxx" +#include + #include namespace { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx index ff6023d5a74f..794d157667bc 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx @@ -12,14 +12,9 @@ #include #include -#include "gtv-application-window.hxx" -#include "gtv-signal-handlers.hxx" -#include "gtv-helpers.hxx" #include "gtv-calc-header-bar.hxx" -#include -#include -#include +#include #include namespace { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.hxx b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.hxx index 6e0815cf5b3a..a1a4d37a31cf 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.hxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.hxx @@ -12,7 +12,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx index dc099bcb4e87..f63e77fd16e4 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx @@ -9,15 +9,14 @@ #include -#include #include #include "gtv-application-window.hxx" -#include "gtv-signal-handlers.hxx" #include "gtv-helpers.hxx" #include "gtv-comments-sidebar.hxx" -#include +#include + #include #ifdef __GNUC__ diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx index 097bacb62062..b557fe4ba99b 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx @@ -14,6 +14,9 @@ #include #include "gtv-helpers.hxx" +#include "gtv-signal-handlers.hxx" + +#include void GtvHelpers::userPromptDialog(GtkWindow* pWindow, const std::string& aTitle, std::map& aEntries) { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx index cc686bfdfdd4..c4a4f4130695 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx @@ -12,13 +12,12 @@ #include -#include "gtv-signal-handlers.hxx" - #include +#include #include #include -#include +#include #define UI_FILE_NAME "gtv.ui" diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx index fcb336fb248b..bb70a15159d1 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx @@ -10,24 +10,17 @@ #include #include -#include #include -#include #include #include #include "gtv-application-window.hxx" -#include "gtv-signal-handlers.hxx" -#include "gtv-helpers.hxx" #include "gtv-lok-dialog.hxx" #include #include -#include -#include - namespace { struct GtvLokDialogPrivate diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx index 359b6ad20833..794774acfe52 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx @@ -11,16 +11,12 @@ #include "gtv-application-window.hxx" #include "gtv-helpers.hxx" -#include "gtv-signal-handlers.hxx" #include "gtv-calc-header-bar.hxx" #include "gtv-comments-sidebar.hxx" #include "gtv-lokdocview-signal-handlers.hxx" #include "gtv-lok-dialog.hxx" #include -#include - -#include static gboolean deleteLokDialog(GtkWidget* pWidget, GdkEvent* /*event*/, gpointer userdata) { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx index aedc8d216ad0..41fc73ab1a07 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx @@ -11,6 +11,7 @@ #define GTV_LOKDOCVIEW_SIGNAL_HANDLERS_H #include +#include namespace LOKDocViewSigHandlers { void editChanged(LOKDocView* pDocView, gboolean bWasEdit, gpointer); diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx index f2b76c1a93e3..73ff6042e911 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx @@ -13,15 +13,13 @@ #include "gtv-main-toolbar.hxx" #include "gtv-signal-handlers.hxx" #include "gtv-helpers.hxx" -#include "gtv-calc-header-bar.hxx" -#include "gtv-lok-dialog.hxx" +#include + +#include #include #include -#include -#include - namespace { struct GtvMainToolbarPrivateImpl diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main.cxx index c57afd0c2abe..a1bf7ed928e2 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-main.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-main.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include #include "gtv-application.hxx" diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx index dd601375a32c..df4146628cc1 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx @@ -12,9 +12,9 @@ #include "gtv-application-window.hxx" #include "gtv-helpers.hxx" #include "gtv-lokdocview-signal-handlers.hxx" -#include "gtv-lok-dialog.hxx" +#include "gtv-signal-handlers.hxx" -#include +#include #include #include diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx index 28b6bc54d915..54a05c653e34 100644 --- a/libreofficekit/qa/tilebench/tilebench.cxx +++ b/libreofficekit/qa/tilebench/tilebench.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include #include #include @@ -15,7 +14,6 @@ #include #include #include -#include #include #include @@ -23,7 +21,6 @@ #include #include -#include using namespace lok; diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx index bc42f3e95918..9e7203b3bd69 100644 --- a/libreofficekit/source/gtk/tilebuffer.hxx +++ b/libreofficekit/source/gtk/tilebuffer.hxx @@ -10,13 +10,11 @@ #ifndef INCLUDED_TILEBUFFER_HXX #define INCLUDED_TILEBUFFER_HXX -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include #define LOK_TILEBUFFER_ERROR (LOKTileBufferErrorQuark()) -- cgit