Rework GObject typedefs to make GTK-Doc happy

5 files changed, 42 insertions, 24 deletions

diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
index 047708ed..89892164 100644
--- a/liblightdm-gobject/lightdm/greeter.h
+++ b/liblightdm-gobject/lightdm/greeter.h
@@ -23,6 +23,9 @@ G_BEGIN_DECLS
 #define LIGHTDM_IS_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_GREETER))
 #define LIGHTDM_GREETER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterClass))
 
+typedef struct _LightDMGreeter          LightDMGreeter;
+typedef struct _LightDMGreeterClass     LightDMGreeterClass;
+
 #define LIGHTDM_GREETER_ERROR lightdm_greeter_error_quark ()
 
 #define LIGHTDM_GREETER_SIGNAL_SHOW_PROMPT             "show-prompt"
@@ -58,12 +61,12 @@ typedef enum
 
 GType lightdm_message_type_get_type (void);
 
-typedef struct
+struct _LightDMGreeter
 {
     GObject parent_instance;
-} LightDMGreeter;
+};
 
-typedef struct
+struct _LightDMGreeterClass
 {
     GObjectClass parent_class;
 
@@ -79,7 +82,7 @@ typedef struct
     void (*reserved2) (void);
     void (*reserved3) (void);
     void (*reserved4) (void);
-} LightDMGreeterClass;
+};
 
 #ifdef GLIB_VERSION_2_44
 typedef LightDMGreeter *LightDMGreeter_autoptr;
diff --git a/liblightdm-gobject/lightdm/language.h b/liblightdm-gobject/lightdm/language.h
index 6c3f83bc..aa781e26 100644
--- a/liblightdm-gobject/lightdm/language.h
+++ b/liblightdm-gobject/lightdm/language.h
@@ -22,12 +22,15 @@ G_BEGIN_DECLS
 #define LIGHTDM_IS_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LANGUAGE))
 #define LIGHTDM_LANGUAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguageClass))
 
-typedef struct
+typedef struct _LightDMLanguage          LightDMLanguage;
+typedef struct _LightDMLanguageClass     LightDMLanguageClass;
+
+struct _LightDMLanguage
 {
     GObject parent_instance;
-} LightDMLanguage;
+};
 
-typedef struct
+struct _LightDMLanguageClass
 {
     GObjectClass parent_class;
 
@@ -38,7 +41,7 @@ typedef struct
     void (*reserved4) (void);
     void (*reserved5) (void);
     void (*reserved6) (void);
-} LightDMLanguageClass;
+};
 
 #ifdef GLIB_VERSION_2_44
 typedef LightDMLanguage *LightDMLanguage_autoptr;
diff --git a/liblightdm-gobject/lightdm/layout.h b/liblightdm-gobject/lightdm/layout.h
index c971980b..c4c4a6fa 100644
--- a/liblightdm-gobject/lightdm/layout.h
+++ b/liblightdm-gobject/lightdm/layout.h
@@ -22,12 +22,15 @@ G_BEGIN_DECLS
 #define LIGHTDM_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LAYOUT))
 #define LIGHTDM_LAYOUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayoutClass))
 
-typedef struct
+typedef struct _LightDMLayout          LightDMLayout;
+typedef struct _LightDMLayoutClass     LightDMLayoutClass;
+
+struct _LightDMLayout
 {
     GObject parent_instance;
-} LightDMLayout;
+};
 
-typedef struct
+struct _LightDMLayoutClass
 {
     GObjectClass parent_class;
 
@@ -38,7 +41,7 @@ typedef struct
     void (*reserved4) (void);
     void (*reserved5) (void);
     void (*reserved6) (void);
-} LightDMLayoutClass;
+};
 
 #ifdef GLIB_VERSION_2_44
 typedef LightDMLayout *LightDMLayout_autoptr;
diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h
index 9c447e1f..476ea89e 100644
--- a/liblightdm-gobject/lightdm/session.h
+++ b/liblightdm-gobject/lightdm/session.h
@@ -22,12 +22,15 @@ G_BEGIN_DECLS
 #define LIGHTDM_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_SESSION))
 #define LIGHTDM_SESSION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_SESSION, LightDMSessionClass))
 
-typedef struct
+typedef struct _LightDMSession          LightDMSession;
+typedef struct _LightDMSessionClass     LightDMSessionClass;
+
+struct _LightDMSession
 {
     GObject parent_instance;
-} LightDMSession;
+};
 
-typedef struct
+struct _LightDMSessionClass
 {
     GObjectClass parent_class;
 
@@ -38,7 +41,7 @@ typedef struct
     void (*reserved4) (void);
     void (*reserved5) (void);
     void (*reserved6) (void);
-} LightDMSessionClass;
+};
 
 #ifdef GLIB_VERSION_2_44
 typedef LightDMSession *LightDMSession_autoptr;
diff --git a/liblightdm-gobject/lightdm/user.h b/liblightdm-gobject/lightdm/user.h
index d092477a..1e98ba77 100644
--- a/liblightdm-gobject/lightdm/user.h
+++ b/liblightdm-gobject/lightdm/user.h
@@ -22,6 +22,9 @@ G_BEGIN_DECLS
 #define LIGHTDM_IS_USER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER_LIST))
 #define LIGHTDM_USER_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserListClass))
 
+typedef struct _LightDMUserList           LightDMUserList;
+typedef struct _LightDMUserListClass      LightDMUserListClass;
+
 #define LIGHTDM_TYPE_USER            (lightdm_user_get_type())
 #define LIGHTDM_USER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_USER, LightDMUser));
 #define LIGHTDM_USER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_USER, LightDMUserClass))
@@ -29,18 +32,21 @@ G_BEGIN_DECLS
 #define LIGHTDM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER))
 #define LIGHTDM_USER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_USER, LightDMUserClass))
 
+typedef struct _LightDMUser          LightDMUser;
+typedef struct _LightDMUserClass     LightDMUserClass;
+
 #define LIGHTDM_USER_LIST_SIGNAL_USER_ADDED   "user-added"
 #define LIGHTDM_USER_LIST_SIGNAL_USER_CHANGED "user-changed"
 #define LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED "user-removed"
 
 #define LIGHTDM_SIGNAL_USER_CHANGED "changed"
 
-typedef struct
+struct _LightDMUser
 {
     GObject parent_instance;
-} LightDMUser;
+};
 
-typedef struct
+struct _LightDMUserClass
 {
     GObjectClass parent_class;
     void (*changed)(LightDMUser *user);
@@ -52,14 +58,14 @@ typedef struct
     void (*reserved4) (void);
     void (*reserved5) (void);
     void (*reserved6) (void);
-} LightDMUserClass;
+};
 
-typedef struct
+struct _LightDMUserList
 {
     GObject parent_instance;
-} LightDMUserList;
+};
 
-typedef struct
+struct _LightDMUserListClass
 {
     GObjectClass parent_class;
 
@@ -74,7 +80,7 @@ typedef struct
     void (*reserved4) (void);
     void (*reserved5) (void);
     void (*reserved6) (void);
-} LightDMUserListClass;
+};
 
 #ifdef GLIB_VERSION_2_44
 typedef LightDMUser *LightDMUser_autoptr;