[gtk/pango2] fontexplorer: include file cleanups

[Matthias Clasen <matthiasc src gnome org>]

commit 9ca41e00d6341972ebde513b501a5ba7fcd94749
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jul 27 15:25:44 2022 -0500

    fontexplorer: include file cleanups

 demos/font-explorer/font_features.c   | 1959 ---------------------------------
 demos/font-explorer/fontcolors.c      |    4 +-
 demos/font-explorer/fontcontrols.c    |    3 +-
 demos/font-explorer/fontexplorerapp.c |    4 +-
 demos/font-explorer/fontexplorerwin.c |    7 +-
 demos/font-explorer/fontfeatures.c    |    2 +-
 demos/font-explorer/fontvariations.c  |    4 +-
 demos/font-explorer/glyphmodel.c      |    1 +
 demos/font-explorer/glyphsview.c      |    7 +-
 demos/font-explorer/glyphview.c       |    1 +
 demos/font-explorer/infoview.c        |    2 +-
 demos/font-explorer/language-names.c  |    2 -
 demos/font-explorer/main.c            |    1 +
 demos/font-explorer/plainview.c       |    7 +-
 demos/font-explorer/rangeedit.c       |    1 +
 demos/font-explorer/samplechooser.c   |    1 +
 demos/font-explorer/sampleeditor.c    |    1 +
 demos/font-explorer/styleview.c       |    7 +-
 demos/font-explorer/waterfallview.c   |    7 +-
 19 files changed, 38 insertions(+), 1983 deletions(-)
---
diff --git a/demos/font-explorer/fontcolors.c b/demos/font-explorer/fontcolors.c
index 8434d676aa..d262eeab62 100644
--- a/demos/font-explorer/fontcolors.c
+++ b/demos/font-explorer/fontcolors.c
@@ -1,8 +1,10 @@
 #include "fontcolors.h"
-#include "rangeedit.h"
+
 #include <gtk/gtk.h>
 #include <hb-ot.h>
 
+#include "rangeedit.h"
+
 enum {
   PROP_FONT_MAP = 1,
   PROP_FONT_DESC,
diff --git a/demos/font-explorer/fontcontrols.c b/demos/font-explorer/fontcontrols.c
index 95a42efc14..4d43b98f39 100644
--- a/demos/font-explorer/fontcontrols.c
+++ b/demos/font-explorer/fontcontrols.c
@@ -1,9 +1,10 @@
 #include "fontcontrols.h"
-#include "rangeedit.h"
 
 #include <gtk/gtk.h>
 #include <hb-ot.h>
 
+#include "rangeedit.h"
+
 enum {
   PROP_SIZE = 1,
   PROP_LETTERSPACING,
diff --git a/demos/font-explorer/fontexplorerapp.c b/demos/font-explorer/fontexplorerapp.c
index 74b88d89a6..9e32b60c95 100644
--- a/demos/font-explorer/fontexplorerapp.c
+++ b/demos/font-explorer/fontexplorerapp.c
@@ -1,7 +1,9 @@
 #include "config.h"
-#include <gtk/gtk.h>
 
 #include "fontexplorerapp.h"
+
+#include <gtk/gtk.h>
+
 #include "fontexplorerwin.h"
 
 #include "demo_conf.h"
diff --git a/demos/font-explorer/fontexplorerwin.c b/demos/font-explorer/fontexplorerwin.c
index 934b48974d..905545a2ec 100644
--- a/demos/font-explorer/fontexplorerwin.c
+++ b/demos/font-explorer/fontexplorerwin.c
@@ -1,5 +1,8 @@
 #include "fontexplorerwin.h"
 
+#include <gtk/gtk.h>
+#include <string.h>
+
 #include "fontcolors.h"
 #include "fontcontrols.h"
 #include "fontexplorerapp.h"
@@ -13,10 +16,6 @@
 #include "styleview.h"
 #include "waterfallview.h"
 
-#include <gtk/gtk.h>
-#include <string.h>
-
-
 struct _FontExplorerWindow
 {
   GtkApplicationWindow parent;
diff --git a/demos/font-explorer/fontfeatures.c b/demos/font-explorer/fontfeatures.c
index 2fc6d0fb7a..87a9969c67 100644
--- a/demos/font-explorer/fontfeatures.c
+++ b/demos/font-explorer/fontfeatures.c
@@ -1,4 +1,5 @@
 #include "fontfeatures.h"
+
 #include <gtk/gtk.h>
 #include <hb-ot.h>
 #include <glib/gi18n.h>
@@ -6,7 +7,6 @@
 #include "open-type-layout.h"
 #include "language-names.h"
 
-
 enum {
   PROP_FONT_MAP = 1,
   PROP_FONT_DESC,
diff --git a/demos/font-explorer/fontvariations.c b/demos/font-explorer/fontvariations.c
index a138dd116f..747ab22f4b 100644
--- a/demos/font-explorer/fontvariations.c
+++ b/demos/font-explorer/fontvariations.c
@@ -1,8 +1,10 @@
 #include "fontvariations.h"
-#include "rangeedit.h"
+
 #include <gtk/gtk.h>
 #include <hb-ot.h>
 
+#include "rangeedit.h"
+
 enum {
   PROP_FONT_MAP = 1,
   PROP_FONT_DESC,
diff --git a/demos/font-explorer/glyphmodel.c b/demos/font-explorer/glyphmodel.c
index eb925795a7..25e2bb605f 100644
--- a/demos/font-explorer/glyphmodel.c
+++ b/demos/font-explorer/glyphmodel.c
@@ -1,4 +1,5 @@
 #include "glyphmodel.h"
+
 #include "glyphitem.h"
 
 struct _GlyphModel {
diff --git a/demos/font-explorer/glyphsview.c b/demos/font-explorer/glyphsview.c
index 4ef0b44d47..f9cabdd566 100644
--- a/demos/font-explorer/glyphsview.c
+++ b/demos/font-explorer/glyphsview.c
@@ -1,10 +1,11 @@
 #include "glyphsview.h"
+
+#include <gtk/gtk.h>
+#include <hb-ot.h>
+
 #include "glyphitem.h"
 #include "glyphmodel.h"
 #include "glyphview.h"
-#include <gtk/gtk.h>
-
-#include <hb-ot.h>
 
 enum {
   PROP_FONT_MAP = 1,
diff --git a/demos/font-explorer/glyphview.c b/demos/font-explorer/glyphview.c
index 2fd47a6ed7..bab969f74b 100644
--- a/demos/font-explorer/glyphview.c
+++ b/demos/font-explorer/glyphview.c
@@ -1,4 +1,5 @@
 #include "glyphview.h"
+
 #include <gtk/gtk.h>
 #include <hb-ot.h>
 
diff --git a/demos/font-explorer/infoview.c b/demos/font-explorer/infoview.c
index 11c7c69353..92c94f963c 100644
--- a/demos/font-explorer/infoview.c
+++ b/demos/font-explorer/infoview.c
@@ -1,6 +1,6 @@
 #include "infoview.h"
-#include <gtk/gtk.h>
 
+#include <gtk/gtk.h>
 #include <hb-ot.h>
 
 enum {
diff --git a/demos/font-explorer/language-names.c b/demos/font-explorer/language-names.c
index 235d87bd30..a0546c6730 100644
--- a/demos/font-explorer/language-names.c
+++ b/demos/font-explorer/language-names.c
@@ -1,5 +1,3 @@
-#include "config.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/demos/font-explorer/main.c b/demos/font-explorer/main.c
index 1a82fa5d33..ab1a27bdbb 100644
--- a/demos/font-explorer/main.c
+++ b/demos/font-explorer/main.c
@@ -1,4 +1,5 @@
 #include <gtk/gtk.h>
+
 #include <fontexplorerapp.h>
 
 int
diff --git a/demos/font-explorer/plainview.c b/demos/font-explorer/plainview.c
index c800345b2a..4bb5a67ad1 100644
--- a/demos/font-explorer/plainview.c
+++ b/demos/font-explorer/plainview.c
@@ -1,10 +1,11 @@
 #include "plainview.h"
+
+#include <gtk/gtk.h>
+#include <hb-ot.h>
+
 #include "glyphitem.h"
 #include "glyphmodel.h"
 #include "glyphview.h"
-#include <gtk/gtk.h>
-
-#include <hb-ot.h>
 
 enum {
   PROP_FONT_MAP = 1,
diff --git a/demos/font-explorer/rangeedit.c b/demos/font-explorer/rangeedit.c
index d68dedfb4b..c0982c005d 100644
--- a/demos/font-explorer/rangeedit.c
+++ b/demos/font-explorer/rangeedit.c
@@ -1,4 +1,5 @@
 #include "rangeedit.h"
+
 #include <gtk/gtk.h>
 #include <hb-ot.h>
 
diff --git a/demos/font-explorer/samplechooser.c b/demos/font-explorer/samplechooser.c
index 6b7975e370..c04b00d265 100644
--- a/demos/font-explorer/samplechooser.c
+++ b/demos/font-explorer/samplechooser.c
@@ -1,4 +1,5 @@
 #include "samplechooser.h"
+
 #include <gtk/gtk.h>
 #include <hb-ot.h>
 
diff --git a/demos/font-explorer/sampleeditor.c b/demos/font-explorer/sampleeditor.c
index 8ec68e0a38..b0d5c99b92 100644
--- a/demos/font-explorer/sampleeditor.c
+++ b/demos/font-explorer/sampleeditor.c
@@ -1,4 +1,5 @@
 #include "sampleeditor.h"
+
 #include <gtk/gtk.h>
 
 enum {
diff --git a/demos/font-explorer/styleview.c b/demos/font-explorer/styleview.c
index 97f91f4272..a33e3717d2 100644
--- a/demos/font-explorer/styleview.c
+++ b/demos/font-explorer/styleview.c
@@ -1,10 +1,11 @@
 #include "styleview.h"
+
+#include <gtk/gtk.h>
+#include <hb-ot.h>
+
 #include "glyphitem.h"
 #include "glyphmodel.h"
 #include "glyphview.h"
-#include <gtk/gtk.h>
-
-#include <hb-ot.h>
 
 enum {
   PROP_FONT_MAP = 1,
diff --git a/demos/font-explorer/waterfallview.c b/demos/font-explorer/waterfallview.c
index ea76e33877..69ff13acf6 100644
--- a/demos/font-explorer/waterfallview.c
+++ b/demos/font-explorer/waterfallview.c
@@ -1,10 +1,11 @@
 #include "waterfallview.h"
+
+#include <gtk/gtk.h>
+#include <hb-ot.h>
+
 #include "glyphitem.h"
 #include "glyphmodel.h"
 #include "glyphview.h"
-#include <gtk/gtk.h>
-
-#include <hb-ot.h>
 
 enum {
   PROP_FONT_MAP = 1,