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 <vmiklos@collabora.com>
2020-03-03 23:40:31 +01:00 · 2020-03-03 23:40:31 +01:00 · 4f2cf88979
commit 4f2cf88979
parent a6e3a862aa
17 changed files with 24 additions and 43 deletions
--- a/libreofficekit/IwyuFilter_libreofficekit.yaml
+++ b/libreofficekit/IwyuFilter_libreofficekit.yaml
@ -0,0 +1,2 @@
+---
+assumeFilename: libreofficekit/source/gtk/lokdocview.cxx
--- 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 <boost/property_tree/json_parser.hpp>
-#include <optional>

 namespace {

--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
@ -12,7 +12,6 @@

 #include <gtk/gtk.h>

-#include <LibreOfficeKit/LibreOfficeKitGtk.h>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>

 #include "gtv-main-toolbar.hxx"
--- 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 <LibreOfficeKit/LibreOfficeKitGtk.h>
+
 #include <string>

 namespace {
--- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
@ -12,14 +12,9 @@
 #include <cmath>
 #include <iostream>

-#include "gtv-application-window.hxx"
-#include "gtv-signal-handlers.hxx"
-#include "gtv-helpers.hxx"
 #include "gtv-calc-header-bar.hxx"

-#include <map>
-#include <boost/property_tree/json_parser.hpp>
-#include <optional>
+#include <boost/property_tree/ptree.hpp>
 #include <o3tl/unreachable.hxx>

 namespace {
--- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.hxx
@ -12,7 +12,7 @@

 #include <gtk/gtk.h>

-#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>

 G_BEGIN_DECLS

--- a/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx
@ -9,15 +9,14 @@

 #include <gtk/gtk.h>

-#include <cmath>
 #include <iostream>

 #include "gtv-application-window.hxx"
-#include "gtv-signal-handlers.hxx"
 #include "gtv-helpers.hxx"
 #include "gtv-comments-sidebar.hxx"

-#include <map>
+#include <LibreOfficeKit/LibreOfficeKitGtk.h>
+
 #include <boost/property_tree/json_parser.hpp>

 #ifdef __GNUC__
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
@ -14,6 +14,9 @@
 #include <cstring>

 #include "gtv-helpers.hxx"
+#include "gtv-signal-handlers.hxx"
+
+#include <boost/property_tree/ptree.hpp>

 void GtvHelpers::userPromptDialog(GtkWindow* pWindow, const std::string& aTitle, std::map<std::string, std::string>& aEntries)
 {
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
@ -12,13 +12,12 @@

 #include <gtk/gtk.h>

-#include "gtv-signal-handlers.hxx"
-
 #include <map>
+#include <sstream>
 #include <string>
 #include <memory>

-#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>

 #define UI_FILE_NAME "gtv.ui"

--- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
@ -10,24 +10,17 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>

-#include <cmath>
 #include <iostream>
-#include <sstream>

 #include <LibreOfficeKit/LibreOfficeKitGtk.h>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>

 #include "gtv-application-window.hxx"
-#include "gtv-signal-handlers.hxx"
-#include "gtv-helpers.hxx"
 #include "gtv-lok-dialog.hxx"

 #include <com/sun/star/awt/Key.hpp>
 #include <vcl/event.hxx>

-#include <map>
-#include <boost/property_tree/json_parser.hpp>
-
 namespace {

 struct GtvLokDialogPrivate
--- 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 <boost/property_tree/json_parser.hpp>
-#include <optional>
-
-#include <iostream>

 static gboolean deleteLokDialog(GtkWidget* pWidget, GdkEvent* /*event*/, gpointer userdata)
 {
--- 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 <gtk/gtk.h>
+#include <LibreOfficeKit/LibreOfficeKitGtk.h>

 namespace LOKDocViewSigHandlers {
    void editChanged(LOKDocView* pDocView, gboolean bWasEdit, gpointer);
--- 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 <LibreOfficeKit/LibreOfficeKitGtk.h>
+
+#include <fstream>
 #include <map>
 #include <memory>

-#include <boost/property_tree/json_parser.hpp>
-#include <optional>
-
 namespace {

 struct GtvMainToolbarPrivateImpl
--- 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 <gtk/gtk.h>
+#include <gio/gio.h>

 #include "gtv-application.hxx"

--- 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 <sal/types.h>
+#include <sal/macros.h>

 #include <map>
 #include <vector>
--- 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 <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <cmath>
@ -15,7 +14,6 @@
 #include <vector>
 #include <atomic>
 #include <iostream>
-#include <fstream>
 #include <osl/time.h>

 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
@ -23,7 +21,6 @@
 #include <LibreOfficeKit/LibreOfficeKit.hxx>

 #include <boost/property_tree/json_parser.hpp>
-#include <optional>

 using namespace lok;

--- 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 <gdk/gdkkeysyms.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <map>
+#include <cairo.h>
+#include <gio/gio.h>
+#include <glib.h>

-#include <LibreOfficeKit/LibreOfficeKit.h>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <LibreOfficeKit/LibreOfficeKitGtk.h>
+#include <map>

 #define LOK_TILEBUFFER_ERROR (LOKTileBufferErrorQuark())