[gtk/wip/sadiq/fixes] examples: Follow gtk+ convention for naming types

From: Mohammed Sadiq <pksadiq src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk/wip/sadiq/fixes] examples: Follow gtk+ convention for naming types
Date: Tue, 8 May 2018 14:46:58 +0000 (UTC)
commit 4d7177e50c4e7643c108b3457435c37c55781352
Author: Mohammed Sadiq <sadiq sadiqpk org>
Date:   Tue May 8 20:10:40 2018 +0530

    examples: Follow gtk+ convention for naming types
    
    In Gtk+, GObject and elsewhere related, the following convention
    is used for naming types: NAMESPACE followed by _TYPE_ followed
    by the class suffix name in capitals.
    
    Let's be consistent and do this in examples too.

 examples/application1/exampleapp.c       | 2 +-
 examples/application1/exampleapp.h       | 2 +-
 examples/application1/exampleappwin.c    | 2 +-
 examples/application1/exampleappwin.h    | 2 +-
 examples/application10/exampleapp.c      | 2 +-
 examples/application10/exampleapp.h      | 2 +-
 examples/application10/exampleappprefs.c | 2 +-
 examples/application10/exampleappprefs.h | 2 +-
 examples/application10/exampleappwin.c   | 2 +-
 examples/application10/exampleappwin.h   | 2 +-
 examples/application2/exampleapp.c       | 2 +-
 examples/application2/exampleapp.h       | 2 +-
 examples/application2/exampleappwin.c    | 2 +-
 examples/application2/exampleappwin.h    | 2 +-
 examples/application3/exampleapp.c       | 2 +-
 examples/application3/exampleapp.h       | 2 +-
 examples/application3/exampleappwin.c    | 2 +-
 examples/application3/exampleappwin.h    | 2 +-
 examples/application4/exampleapp.c       | 2 +-
 examples/application4/exampleapp.h       | 2 +-
 examples/application4/exampleappwin.c    | 2 +-
 examples/application4/exampleappwin.h    | 2 +-
 examples/application5/exampleapp.c       | 2 +-
 examples/application5/exampleapp.h       | 2 +-
 examples/application5/exampleappwin.c    | 2 +-
 examples/application5/exampleappwin.h    | 2 +-
 examples/application6/exampleapp.c       | 2 +-
 examples/application6/exampleapp.h       | 2 +-
 examples/application6/exampleappprefs.c  | 2 +-
 examples/application6/exampleappprefs.h  | 2 +-
 examples/application6/exampleappwin.c    | 2 +-
 examples/application6/exampleappwin.h    | 2 +-
 examples/application7/exampleapp.c       | 2 +-
 examples/application7/exampleapp.h       | 2 +-
 examples/application7/exampleappprefs.c  | 2 +-
 examples/application7/exampleappprefs.h  | 2 +-
 examples/application7/exampleappwin.c    | 2 +-
 examples/application7/exampleappwin.h    | 2 +-
 examples/application8/exampleapp.c       | 2 +-
 examples/application8/exampleapp.h       | 2 +-
 examples/application8/exampleappprefs.c  | 2 +-
 examples/application8/exampleappprefs.h  | 2 +-
 examples/application8/exampleappwin.c    | 2 +-
 examples/application8/exampleappwin.h    | 2 +-
 examples/application9/exampleapp.c       | 2 +-
 examples/application9/exampleapp.h       | 2 +-
 examples/application9/exampleappprefs.c  | 2 +-
 examples/application9/exampleappprefs.h  | 2 +-
 examples/application9/exampleappwin.c    | 2 +-
 examples/application9/exampleappwin.h    | 2 +-
 50 files changed, 50 insertions(+), 50 deletions(-)
---
diff --git a/examples/application1/exampleapp.c b/examples/application1/exampleapp.c
index 565bc35c75..01d4869e6f 100644
--- a/examples/application1/exampleapp.c
+++ b/examples/application1/exampleapp.c
@@ -56,7 +56,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application1/exampleapp.h b/examples/application1/exampleapp.h
index f7b837fbd5..17a73dadb4 100644
--- a/examples/application1/exampleapp.h
+++ b/examples/application1/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 ExampleApp     *example_app_new         (void);
diff --git a/examples/application1/exampleappwin.c b/examples/application1/exampleappwin.c
index 24dd05dd9f..025826102d 100644
--- a/examples/application1/exampleappwin.c
+++ b/examples/application1/exampleappwin.c
@@ -23,7 +23,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application1/exampleappwin.h b/examples/application1/exampleappwin.h
index 786338d083..478d76ef04 100644
--- a/examples/application1/exampleappwin.h
+++ b/examples/application1/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
 
 
diff --git a/examples/application10/exampleapp.c b/examples/application10/exampleapp.c
index 64a3ceb100..2ade3a4698 100644
--- a/examples/application10/exampleapp.c
+++ b/examples/application10/exampleapp.c
@@ -107,7 +107,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application10/exampleapp.h b/examples/application10/exampleapp.h
index 51093791a3..c11b408c9e 100644
--- a/examples/application10/exampleapp.h
+++ b/examples/application10/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
diff --git a/examples/application10/exampleappprefs.c b/examples/application10/exampleappprefs.c
index 4bdf6542ca..cf079bdc33 100644
--- a/examples/application10/exampleappprefs.c
+++ b/examples/application10/exampleappprefs.c
@@ -55,5 +55,5 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_PREFS, "transient-for", win, "use-header-bar", TRUE, NULL);
 }
diff --git a/examples/application10/exampleappprefs.h b/examples/application10/exampleappprefs.h
index 2f08819ffb..f92fb14266 100644
--- a/examples/application10/exampleappprefs.h
+++ b/examples/application10/exampleappprefs.h
@@ -5,7 +5,7 @@
 #include "exampleappwin.h"
 
 
-#define EXAMPLE_APP_PREFS_TYPE (example_app_prefs_get_type ())
+#define EXAMPLE_TYPE_APP_PREFS (example_app_prefs_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, GtkDialog)
 
 
diff --git a/examples/application10/exampleappwin.c b/examples/application10/exampleappwin.c
index a9311ec5a2..d5933d1e9e 100644
--- a/examples/application10/exampleappwin.c
+++ b/examples/application10/exampleappwin.c
@@ -253,7 +253,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application10/exampleappwin.h b/examples/application10/exampleappwin.h
index 88de502f88..315ef6494e 100644
--- a/examples/application10/exampleappwin.h
+++ b/examples/application10/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
 
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
diff --git a/examples/application2/exampleapp.c b/examples/application2/exampleapp.c
index 565bc35c75..01d4869e6f 100644
--- a/examples/application2/exampleapp.c
+++ b/examples/application2/exampleapp.c
@@ -56,7 +56,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application2/exampleapp.h b/examples/application2/exampleapp.h
index 51093791a3..c11b408c9e 100644
--- a/examples/application2/exampleapp.h
+++ b/examples/application2/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
diff --git a/examples/application2/exampleappwin.c b/examples/application2/exampleappwin.c
index 46c43ef85e..b6fbcdc455 100644
--- a/examples/application2/exampleappwin.c
+++ b/examples/application2/exampleappwin.c
@@ -26,7 +26,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application2/exampleappwin.h b/examples/application2/exampleappwin.h
index 786338d083..478d76ef04 100644
--- a/examples/application2/exampleappwin.h
+++ b/examples/application2/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
 
 
diff --git a/examples/application3/exampleapp.c b/examples/application3/exampleapp.c
index 565bc35c75..01d4869e6f 100644
--- a/examples/application3/exampleapp.c
+++ b/examples/application3/exampleapp.c
@@ -56,7 +56,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application3/exampleapp.h b/examples/application3/exampleapp.h
index 51093791a3..c11b408c9e 100644
--- a/examples/application3/exampleapp.h
+++ b/examples/application3/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
diff --git a/examples/application3/exampleappwin.c b/examples/application3/exampleappwin.c
index 01fb4ae115..a6a9a2ad3e 100644
--- a/examples/application3/exampleappwin.c
+++ b/examples/application3/exampleappwin.c
@@ -29,7 +29,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application3/exampleappwin.h b/examples/application3/exampleappwin.h
index 786338d083..478d76ef04 100644
--- a/examples/application3/exampleappwin.h
+++ b/examples/application3/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
 
 
diff --git a/examples/application4/exampleapp.c b/examples/application4/exampleapp.c
index 0f01fb388a..dff6fbec00 100644
--- a/examples/application4/exampleapp.c
+++ b/examples/application4/exampleapp.c
@@ -100,7 +100,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application4/exampleapp.h b/examples/application4/exampleapp.h
index 51093791a3..c11b408c9e 100644
--- a/examples/application4/exampleapp.h
+++ b/examples/application4/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
diff --git a/examples/application4/exampleappwin.c b/examples/application4/exampleappwin.c
index 01fb4ae115..a6a9a2ad3e 100644
--- a/examples/application4/exampleappwin.c
+++ b/examples/application4/exampleappwin.c
@@ -29,7 +29,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application4/exampleappwin.h b/examples/application4/exampleappwin.h
index 786338d083..478d76ef04 100644
--- a/examples/application4/exampleappwin.h
+++ b/examples/application4/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
 
 
diff --git a/examples/application5/exampleapp.c b/examples/application5/exampleapp.c
index 0f01fb388a..dff6fbec00 100644
--- a/examples/application5/exampleapp.c
+++ b/examples/application5/exampleapp.c
@@ -100,7 +100,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application5/exampleapp.h b/examples/application5/exampleapp.h
index 51093791a3..c11b408c9e 100644
--- a/examples/application5/exampleapp.h
+++ b/examples/application5/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
diff --git a/examples/application5/exampleappwin.c b/examples/application5/exampleappwin.c
index ca45b85d40..5523ce2336 100644
--- a/examples/application5/exampleappwin.c
+++ b/examples/application5/exampleappwin.c
@@ -49,7 +49,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application5/exampleappwin.h b/examples/application5/exampleappwin.h
index 786338d083..478d76ef04 100644
--- a/examples/application5/exampleappwin.h
+++ b/examples/application5/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
 
 
diff --git a/examples/application6/exampleapp.c b/examples/application6/exampleapp.c
index 64a3ceb100..2ade3a4698 100644
--- a/examples/application6/exampleapp.c
+++ b/examples/application6/exampleapp.c
@@ -107,7 +107,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application6/exampleapp.h b/examples/application6/exampleapp.h
index 51093791a3..c11b408c9e 100644
--- a/examples/application6/exampleapp.h
+++ b/examples/application6/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
diff --git a/examples/application6/exampleappprefs.c b/examples/application6/exampleappprefs.c
index 4bdf6542ca..cf079bdc33 100644
--- a/examples/application6/exampleappprefs.c
+++ b/examples/application6/exampleappprefs.c
@@ -55,5 +55,5 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_PREFS, "transient-for", win, "use-header-bar", TRUE, NULL);
 }
diff --git a/examples/application6/exampleappprefs.h b/examples/application6/exampleappprefs.h
index 2f08819ffb..f92fb14266 100644
--- a/examples/application6/exampleappprefs.h
+++ b/examples/application6/exampleappprefs.h
@@ -5,7 +5,7 @@
 #include "exampleappwin.h"
 
 
-#define EXAMPLE_APP_PREFS_TYPE (example_app_prefs_get_type ())
+#define EXAMPLE_TYPE_APP_PREFS (example_app_prefs_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, GtkDialog)
 
 
diff --git a/examples/application6/exampleappwin.c b/examples/application6/exampleappwin.c
index ca45b85d40..5523ce2336 100644
--- a/examples/application6/exampleappwin.c
+++ b/examples/application6/exampleappwin.c
@@ -49,7 +49,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application6/exampleappwin.h b/examples/application6/exampleappwin.h
index 786338d083..478d76ef04 100644
--- a/examples/application6/exampleappwin.h
+++ b/examples/application6/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
 
 
diff --git a/examples/application7/exampleapp.c b/examples/application7/exampleapp.c
index 64a3ceb100..2ade3a4698 100644
--- a/examples/application7/exampleapp.c
+++ b/examples/application7/exampleapp.c
@@ -107,7 +107,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application7/exampleapp.h b/examples/application7/exampleapp.h
index 51093791a3..c11b408c9e 100644
--- a/examples/application7/exampleapp.h
+++ b/examples/application7/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
diff --git a/examples/application7/exampleappprefs.c b/examples/application7/exampleappprefs.c
index 4bdf6542ca..cf079bdc33 100644
--- a/examples/application7/exampleappprefs.c
+++ b/examples/application7/exampleappprefs.c
@@ -55,5 +55,5 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_PREFS, "transient-for", win, "use-header-bar", TRUE, NULL);
 }
diff --git a/examples/application7/exampleappprefs.h b/examples/application7/exampleappprefs.h
index 2f08819ffb..f92fb14266 100644
--- a/examples/application7/exampleappprefs.h
+++ b/examples/application7/exampleappprefs.h
@@ -5,7 +5,7 @@
 #include "exampleappwin.h"
 
 
-#define EXAMPLE_APP_PREFS_TYPE (example_app_prefs_get_type ())
+#define EXAMPLE_TYPE_APP_PREFS (example_app_prefs_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, GtkDialog)
 
 
diff --git a/examples/application7/exampleappwin.c b/examples/application7/exampleappwin.c
index 3dc75e5beb..2d2e209225 100644
--- a/examples/application7/exampleappwin.c
+++ b/examples/application7/exampleappwin.c
@@ -102,7 +102,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application7/exampleappwin.h b/examples/application7/exampleappwin.h
index 786338d083..478d76ef04 100644
--- a/examples/application7/exampleappwin.h
+++ b/examples/application7/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
 
 
diff --git a/examples/application8/exampleapp.c b/examples/application8/exampleapp.c
index 64a3ceb100..2ade3a4698 100644
--- a/examples/application8/exampleapp.c
+++ b/examples/application8/exampleapp.c
@@ -107,7 +107,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application8/exampleapp.h b/examples/application8/exampleapp.h
index 51093791a3..c11b408c9e 100644
--- a/examples/application8/exampleapp.h
+++ b/examples/application8/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
diff --git a/examples/application8/exampleappprefs.c b/examples/application8/exampleappprefs.c
index 4bdf6542ca..cf079bdc33 100644
--- a/examples/application8/exampleappprefs.c
+++ b/examples/application8/exampleappprefs.c
@@ -55,5 +55,5 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_PREFS, "transient-for", win, "use-header-bar", TRUE, NULL);
 }
diff --git a/examples/application8/exampleappprefs.h b/examples/application8/exampleappprefs.h
index 2f08819ffb..f92fb14266 100644
--- a/examples/application8/exampleappprefs.h
+++ b/examples/application8/exampleappprefs.h
@@ -5,7 +5,7 @@
 #include "exampleappwin.h"
 
 
-#define EXAMPLE_APP_PREFS_TYPE (example_app_prefs_get_type ())
+#define EXAMPLE_TYPE_APP_PREFS (example_app_prefs_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, GtkDialog)
 
 
diff --git a/examples/application8/exampleappwin.c b/examples/application8/exampleappwin.c
index e679129b27..790b29c6a1 100644
--- a/examples/application8/exampleappwin.c
+++ b/examples/application8/exampleappwin.c
@@ -206,7 +206,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application8/exampleappwin.h b/examples/application8/exampleappwin.h
index 786338d083..478d76ef04 100644
--- a/examples/application8/exampleappwin.h
+++ b/examples/application8/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
 
 
diff --git a/examples/application9/exampleapp.c b/examples/application9/exampleapp.c
index 64a3ceb100..2ade3a4698 100644
--- a/examples/application9/exampleapp.c
+++ b/examples/application9/exampleapp.c
@@ -107,7 +107,7 @@ example_app_class_init (ExampleAppClass *class)
 ExampleApp *
 example_app_new (void)
 {
-  return g_object_new (EXAMPLE_APP_TYPE,
+  return g_object_new (EXAMPLE_TYPE_APP,
                        "application-id", "org.gtk.exampleapp",
                        "flags", G_APPLICATION_HANDLES_OPEN,
                        NULL);
diff --git a/examples/application9/exampleapp.h b/examples/application9/exampleapp.h
index 51093791a3..c11b408c9e 100644
--- a/examples/application9/exampleapp.h
+++ b/examples/application9/exampleapp.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 
-#define EXAMPLE_APP_TYPE (example_app_get_type ())
+#define EXAMPLE_TYPE_APP (example_app_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
diff --git a/examples/application9/exampleappprefs.c b/examples/application9/exampleappprefs.c
index 4bdf6542ca..cf079bdc33 100644
--- a/examples/application9/exampleappprefs.c
+++ b/examples/application9/exampleappprefs.c
@@ -55,5 +55,5 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_PREFS, "transient-for", win, "use-header-bar", TRUE, NULL);
 }
diff --git a/examples/application9/exampleappprefs.h b/examples/application9/exampleappprefs.h
index 2f08819ffb..f92fb14266 100644
--- a/examples/application9/exampleappprefs.h
+++ b/examples/application9/exampleappprefs.h
@@ -5,7 +5,7 @@
 #include "exampleappwin.h"
 
 
-#define EXAMPLE_APP_PREFS_TYPE (example_app_prefs_get_type ())
+#define EXAMPLE_TYPE_APP_PREFS (example_app_prefs_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, GtkDialog)
 
 
diff --git a/examples/application9/exampleappwin.c b/examples/application9/exampleappwin.c
index 50ad92a4ac..8aebf1a7a5 100644
--- a/examples/application9/exampleappwin.c
+++ b/examples/application9/exampleappwin.c
@@ -250,7 +250,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_TYPE_APP_WINDOW, "application", app, NULL);
 }
 
 void
diff --git a/examples/application9/exampleappwin.h b/examples/application9/exampleappwin.h
index 786338d083..478d76ef04 100644
--- a/examples/application9/exampleappwin.h
+++ b/examples/application9/exampleappwin.h
@@ -5,7 +5,7 @@
 #include "exampleapp.h"
 
 
-#define EXAMPLE_APP_WINDOW_TYPE (example_app_window_get_type ())
+#define EXAMPLE_TYPE_APP_WINDOW (example_app_window_get_type ())
 G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, GtkApplicationWindow)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]