[gtk/wip/nielsdg/g-declare-interface: 3/3] styleprovider: Use G_DECLARE_INTERFACE

[Niels De Graef <nielsdg src gnome org>]

commit 437491e85ed9a00f210b89eccf6b1fd7ec4b5f66
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri Apr 3 18:58:33 2020 +0200

    styleprovider: Use G_DECLARE_INTERFACE

 gtk/gtkstyleprovider.c | 12 ++++++------
 gtk/gtkstyleprovider.h | 11 +++--------
 2 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c
index 4bcd241054..02e40af86e 100644
--- a/gtk/gtkstyleprovider.c
+++ b/gtk/gtkstyleprovider.c
@@ -66,7 +66,7 @@ gtk_style_provider_get_color (GtkStyleProvider *provider,
 
   gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL);
 
-  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+  iface = GTK_STYLE_PROVIDER_GET_IFACE (provider);
 
   if (!iface->get_color)
     return NULL;
@@ -83,7 +83,7 @@ gtk_style_provider_get_keyframes (GtkStyleProvider *provider,
   gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL);
   gtk_internal_return_val_if_fail (name != NULL, NULL);
 
-  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+  iface = GTK_STYLE_PROVIDER_GET_IFACE (provider);
 
   if (!iface->get_keyframes)
     return NULL;
@@ -107,7 +107,7 @@ gtk_style_provider_lookup (GtkStyleProvider             *provider,
   if (out_change)
     *out_change = 0;
 
-  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+  iface = GTK_STYLE_PROVIDER_GET_IFACE (provider);
 
   if (!iface->lookup)
     return;
@@ -130,7 +130,7 @@ gtk_style_provider_get_settings (GtkStyleProvider *provider)
 
   gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL);
 
-  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+  iface = GTK_STYLE_PROVIDER_GET_IFACE (provider);
 
   if (!iface->get_settings)
     return NULL;
@@ -145,7 +145,7 @@ gtk_style_provider_get_scale (GtkStyleProvider *provider)
 
   gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), 1);
 
-  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+  iface = GTK_STYLE_PROVIDER_GET_IFACE (provider);
 
   if (!iface->get_scale)
     return 1;
@@ -160,7 +160,7 @@ gtk_style_provider_emit_error (GtkStyleProvider *provider,
 {
   GtkStyleProviderInterface *iface;
 
-  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+  iface = GTK_STYLE_PROVIDER_GET_IFACE (provider);
 
   if (iface->emit_error)
     iface->emit_error (provider, section, error);
diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index a0da759bd2..cdb8e66f70 100644
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -28,9 +28,9 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_STYLE_PROVIDER          (gtk_style_provider_get_type ())
-#define GTK_STYLE_PROVIDER(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_STYLE_PROVIDER, 
GtkStyleProvider))
-#define GTK_IS_STYLE_PROVIDER(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_STYLE_PROVIDER))
+#define GTK_TYPE_STYLE_PROVIDER (gtk_style_provider_get_type ())
+GDK_AVAILABLE_IN_ALL
+G_DECLARE_INTERFACE (GtkStyleProvider, gtk_style_provider, GTK, STYLE_PROVIDER, GObject)
 
 /**
  * GTK_STYLE_PROVIDER_PRIORITY_FALLBACK:
@@ -83,11 +83,6 @@ G_BEGIN_DECLS
  */
 #define GTK_STYLE_PROVIDER_PRIORITY_USER        800
 
-typedef struct _GtkStyleProvider GtkStyleProvider; /* dummy typedef */
-
-GDK_AVAILABLE_IN_ALL
-GType gtk_style_provider_get_type (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif /* __GTK_STYLE_PROVIDER_H__ */