From 37633985bd136e12054b0ce3fd2d81212bcc2710 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 7 Jun 2020 08:48:14 -0400 Subject: [PATCH] Drop gtknativeprivate.h No need to ship empty headers. --- gtk/gtkdragicon.c | 2 +- gtk/gtkmain.c | 2 +- gtk/gtknative.c | 2 +- gtk/gtknativeprivate.h | 10 ---------- gtk/gtkpopover.c | 2 +- gtk/gtktextview.c | 2 +- gtk/gtktooltip.c | 2 +- gtk/gtkwidget.c | 2 +- gtk/gtkwindow.c | 2 +- gtk/gtkwindowhandle.c | 2 +- gtk/inspector/focusoverlay.c | 2 +- gtk/inspector/inspect-button.c | 2 +- gtk/inspector/layoutoverlay.c | 2 +- 13 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 gtk/gtknativeprivate.h diff --git a/gtk/gtkdragicon.c b/gtk/gtkdragicon.c index 5099220d3f..1564042260 100644 --- a/gtk/gtkdragicon.c +++ b/gtk/gtkdragicon.c @@ -25,7 +25,7 @@ #include "gtkcssstyleprivate.h" #include "gtkcssnodeprivate.h" #include "gtkcsstypesprivate.h" -#include "gtknativeprivate.h" +#include "gtknative.h" #include "gtkpicture.h" #include "gtkcssboxesimplprivate.h" #include "gtkcssnumbervalueprivate.h" diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 03437167cf..84e7efdc8d 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -96,7 +96,7 @@ #include "gsk/gskprivate.h" #include "gsk/gskrendernodeprivate.h" #include "gtkarrayimplprivate.h" -#include "gtknativeprivate.h" +#include "gtknative.h" #include diff --git a/gtk/gtknative.c b/gtk/gtknative.c index 201453587b..aa9c0ab9ee 100644 --- a/gtk/gtknative.c +++ b/gtk/gtknative.c @@ -19,7 +19,7 @@ #include "config.h" -#include "gtknativeprivate.h" +#include "gtknative.h" #include "gtkcssnodeprivate.h" #include "gtkwidgetprivate.h" #include "gdk/gdk-private.h" diff --git a/gtk/gtknativeprivate.h b/gtk/gtknativeprivate.h deleted file mode 100644 index ec33c017b1..0000000000 --- a/gtk/gtknativeprivate.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __GTK_NATIVE_PRIVATE_H__ -#define __GTK_NATIVE_PRIVATE_H__ - -#include "gtknative.h" - -G_BEGIN_DECLS - -G_END_DECLS - -#endif /* __GTK_NATIVE_PRIVATE_H__ */ diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 7f46641a42..7b925243ec 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -122,7 +122,7 @@ #include "gtkbuildable.h" #include "gtktooltipprivate.h" #include "gtkcssboxesimplprivate.h" -#include "gtknativeprivate.h" +#include "gtknative.h" #include "gtkrender.h" #include "gtkstylecontextprivate.h" diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 13b2010477..65385e5246 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -53,7 +53,7 @@ #include "gtkmagnifierprivate.h" #include "gtkemojichooser.h" #include "gtkpango.h" -#include "gtknativeprivate.h" +#include "gtknative.h" #include "gtkwidgetprivate.h" #include "a11y/gtktextviewaccessibleprivate.h" diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index 4d10edf3e1..74e1e11958 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -35,7 +35,7 @@ #include "gtkwindowprivate.h" #include "gtkwidgetprivate.h" #include "gtkaccessible.h" -#include "gtknativeprivate.h" +#include "gtknative.h" /** * SECTION:gtktooltip diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 91ad52e502..633c2fd8af 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -49,7 +49,7 @@ #include "gtklayoutmanagerprivate.h" #include "gtkmain.h" #include "gtkmarshalers.h" -#include "gtknativeprivate.h" +#include "gtknative.h" #include "gtkpopover.h" #include "gtkprivate.h" #include "gtkrenderbackgroundprivate.h" diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 4e687fa680..2ca244f77c 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -51,7 +51,7 @@ #include "gtkpointerfocusprivate.h" #include "gtkprivate.h" #include "gtkroot.h" -#include "gtknativeprivate.h" +#include "gtknative.h" #include "gtksettings.h" #include "gtkshortcut.h" #include "gtkshortcutcontroller.h" diff --git a/gtk/gtkwindowhandle.c b/gtk/gtkwindowhandle.c index 0a21694e73..47bccbdc97 100644 --- a/gtk/gtkwindowhandle.c +++ b/gtk/gtkwindowhandle.c @@ -28,7 +28,7 @@ #include "gtkgestureprivate.h" #include "gtkintl.h" #include "gtkmodelbuttonprivate.h" -#include "gtknativeprivate.h" +#include "gtknative.h" #include "gtkpopovermenuprivate.h" #include "gtkprivate.h" #include "gtkseparator.h" diff --git a/gtk/inspector/focusoverlay.c b/gtk/inspector/focusoverlay.c index 54231f5820..1ed260d077 100644 --- a/gtk/inspector/focusoverlay.c +++ b/gtk/inspector/focusoverlay.c @@ -24,7 +24,7 @@ #include "gtkintl.h" #include "gtkwidget.h" #include "gtkroot.h" -#include "gtknativeprivate.h" +#include "gtknative.h" struct _GtkFocusOverlay { diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c index ca6e3e0299..ffa6013cae 100644 --- a/gtk/inspector/inspect-button.c +++ b/gtk/inspector/inspect-button.c @@ -34,7 +34,7 @@ #include "gtkwidgetprivate.h" #include "gtkeventcontrollermotion.h" #include "gtkeventcontrollerkey.h" -#include "gtknativeprivate.h" +#include "gtknative.h" #include "gtkwindowprivate.h" static GtkWidget * diff --git a/gtk/inspector/layoutoverlay.c b/gtk/inspector/layoutoverlay.c index b7082fd8ab..589fe8e815 100644 --- a/gtk/inspector/layoutoverlay.c +++ b/gtk/inspector/layoutoverlay.c @@ -5,7 +5,7 @@ #include "gtkcssstyleprivate.h" #include "gtkcssnodeprivate.h" #include "gtkcssnumbervalueprivate.h" -#include "gtknativeprivate.h" +#include "gtknative.h" struct _GtkLayoutOverlay {