[pango/pango2: 37/61] Make types final




commit 94f6230c00a206a7c6ae20da287646b4f7f66baf
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jun 11 16:44:32 2022 -0400

    Make types final
    
    We don't want outside parties to derive from our
    types, unless they are explicitly designed for that.

 pango/pango-context.c         | 2 +-
 pango/pango-fontset-cached.c  | 2 +-
 pango/pango-generic-family.c  | 2 +-
 pango/pango-hbface.c          | 2 +-
 pango/pango-hbfont.c          | 2 +-
 pango/pango-layout.c          | 2 +-
 pango/pango-line-breaker.c    | 2 +-
 pango/pango-userface.c        | 2 +-
 pango/pango-userfont.c        | 2 +-
 pango/pangocoretext-fontmap.c | 2 +-
 pango/pangodwrite-fontmap.cpp | 2 +-
 pango/pangofc-fontmap.c       | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/pango/pango-context.c b/pango/pango-context.c
index c61a03da3..90d48aefd 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -58,7 +58,7 @@ struct _PangoContextClass
 static void pango_context_finalize    (GObject       *object);
 static void context_changed           (PangoContext  *context);
 
-G_DEFINE_TYPE (PangoContext, pango_context, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (PangoContext, pango_context, G_TYPE_OBJECT)
 
 static void
 pango_context_init (PangoContext *context)
diff --git a/pango/pango-fontset-cached.c b/pango/pango-fontset-cached.c
index 248820277..5743a8279 100644
--- a/pango/pango-fontset-cached.c
+++ b/pango/pango-fontset-cached.c
@@ -32,7 +32,7 @@
 #include "pangocairo-font.h"
 #endif
 
-G_DEFINE_TYPE (PangoFontsetCached, pango_fontset_cached, PANGO_TYPE_FONTSET);
+G_DEFINE_FINAL_TYPE (PangoFontsetCached, pango_fontset_cached, PANGO_TYPE_FONTSET);
 
 static void
 pango_fontset_cached_init (PangoFontsetCached *fontset)
diff --git a/pango/pango-generic-family.c b/pango/pango-generic-family.c
index d78946474..b591b8466 100644
--- a/pango/pango-generic-family.c
+++ b/pango/pango-generic-family.c
@@ -102,7 +102,7 @@ struct _PangoGenericFamilyClass
   PangoFontFamilyClass parent_class;
 };
 
-G_DEFINE_TYPE_WITH_CODE (PangoGenericFamily, pango_generic_family, PANGO_TYPE_FONT_FAMILY,
+G_DEFINE_FINAL_TYPE_WITH_CODE (PangoGenericFamily, pango_generic_family, PANGO_TYPE_FONT_FAMILY,
                          G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, pango_generic_family_list_model_init))
 
 static void
diff --git a/pango/pango-hbface.c b/pango/pango-hbface.c
index 8cbc8d708..9b6be5051 100644
--- a/pango/pango-hbface.c
+++ b/pango/pango-hbface.c
@@ -310,7 +310,7 @@ struct _PangoHbFaceClass
   PangoFontFaceClass parent_class;
 };
 
-G_DEFINE_TYPE (PangoHbFace, pango_hb_face, PANGO_TYPE_FONT_FACE)
+G_DEFINE_FINAL_TYPE (PangoHbFace, pango_hb_face, PANGO_TYPE_FONT_FACE)
 
 static void
 pango_hb_face_init (PangoHbFace *self)
diff --git a/pango/pango-hbfont.c b/pango/pango-hbfont.c
index 95e482ec1..78ecee2d3 100644
--- a/pango/pango-hbfont.c
+++ b/pango/pango-hbfont.c
@@ -524,7 +524,7 @@ struct _PangoHbFontClass
   PangoFontClass parent_class;
 };
 
-G_DEFINE_TYPE (PangoHbFont, pango_hb_font, PANGO_TYPE_FONT)
+G_DEFINE_FINAL_TYPE (PangoHbFont, pango_hb_font, PANGO_TYPE_FONT)
 
 static void
 pango_hb_font_init (PangoHbFont *self)
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 65548b16f..42674881c 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -112,7 +112,7 @@ enum
 
 static GParamSpec *props[NUM_PROPERTIES] = { NULL, };
 
-G_DEFINE_TYPE (PangoLayout, pango_layout, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (PangoLayout, pango_layout, G_TYPE_OBJECT)
 
 static void
 pango_layout_init (PangoLayout *layout)
diff --git a/pango/pango-line-breaker.c b/pango/pango-line-breaker.c
index d9cb23097..b9db0125b 100644
--- a/pango/pango-line-breaker.c
+++ b/pango/pango-line-breaker.c
@@ -2097,7 +2097,7 @@ postprocess_line (PangoLineBreaker *self,
 /* }}} */
 /* {{{ PangoLineBreaker implementation */
 
-G_DEFINE_TYPE (PangoLineBreaker, pango_line_breaker, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (PangoLineBreaker, pango_line_breaker, G_TYPE_OBJECT)
 
 enum {
   PROP_CONTEXT = 1,
diff --git a/pango/pango-userface.c b/pango/pango-userface.c
index 30f69b1f1..378a1ef9e 100644
--- a/pango/pango-userface.c
+++ b/pango/pango-userface.c
@@ -188,7 +188,7 @@ struct _PangoUserFaceClass
   PangoFontFaceClass parent_class;
 };
 
-G_DEFINE_TYPE (PangoUserFace, pango_user_face, PANGO_TYPE_FONT_FACE)
+G_DEFINE_FINAL_TYPE (PangoUserFace, pango_user_face, PANGO_TYPE_FONT_FACE)
 
 static void
 pango_user_face_init (PangoUserFace *self)
diff --git a/pango/pango-userfont.c b/pango/pango-userfont.c
index bda7ade0d..e0ebb2873 100644
--- a/pango/pango-userfont.c
+++ b/pango/pango-userfont.c
@@ -44,7 +44,7 @@ struct _PangoUserFontClass
   PangoFontClass parent_class;
 };
 
-G_DEFINE_TYPE (PangoUserFont, pango_user_font, PANGO_TYPE_FONT)
+G_DEFINE_FINAL_TYPE (PangoUserFont, pango_user_font, PANGO_TYPE_FONT)
 
 static void
 pango_user_font_init (PangoUserFont *self G_GNUC_UNUSED)
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index 9c34731a0..ec468e911 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -410,7 +410,7 @@ pango_core_text_font_map_populate (PangoFontMap *map)
 /* }}} */
 /* {{{ PangoCoreTextFontMap implementation */
 
-G_DEFINE_TYPE (PangoCoreTextFontMap, pango_core_text_font_map, PANGO_TYPE_FONT_MAP)
+G_DEFINE_FINAL_TYPE (PangoCoreTextFontMap, pango_core_text_font_map, PANGO_TYPE_FONT_MAP)
 
 static void
 pango_core_text_font_map_init (PangoCoreTextFontMap *self)
diff --git a/pango/pangodwrite-fontmap.cpp b/pango/pangodwrite-fontmap.cpp
index afde1a118..ad4f8e69e 100644
--- a/pango/pangodwrite-fontmap.cpp
+++ b/pango/pangodwrite-fontmap.cpp
@@ -336,7 +336,7 @@ pango_direct_write_font_map_populate (PangoFontMap *map)
 /* }}} */
 /* {{{ PangoDirctWriteFontMap implementation */
 
-G_DEFINE_TYPE (PangoDirectWriteFontMap, pango_direct_write_font_map, PANGO_TYPE_FONT_MAP)
+G_DEFINE_FINAL_TYPE (PangoDirectWriteFontMap, pango_direct_write_font_map, PANGO_TYPE_FONT_MAP)
 
 static void
 pango_direct_write_font_map_init (PangoDirectWriteFontMap *self)
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 99a78d343..0cf445d67 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -508,7 +508,7 @@ pango_fc_font_map_populate (PangoFontMap *map)
 /* }}} */
 /* {{{ PangoFcFontMap implementation */
 
-G_DEFINE_TYPE (PangoFcFontMap, pango_fc_font_map, PANGO_TYPE_FONT_MAP)
+G_DEFINE_FINAL_TYPE (PangoFcFontMap, pango_fc_font_map, PANGO_TYPE_FONT_MAP)
 
 static void
 pango_fc_font_map_init (PangoFcFontMap *self)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]