[balsa/wip/gtk4: 344/351] Remove some duplicative typedefs



commit fb7a41a3e0350ca58bc7f00a523fda3c40539ef1
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon May 7 08:41:50 2018 -0400

    Remove some duplicative typedefs
    
    that are included by G_DECLARE_*_TYPE

 libbalsa/address-book-text.h    |    3 ---
 libbalsa/address-book.h         |    3 ---
 src/balsa-message.h             |    6 ++----
 src/balsa-print-object-decor.h  |    1 +
 src/balsa-print-object-header.h |    1 +
 5 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/libbalsa/address-book-text.h b/libbalsa/address-book-text.h
index f7464ee..cb629b4 100644
--- a/libbalsa/address-book-text.h
+++ b/libbalsa/address-book-text.h
@@ -51,9 +51,6 @@ struct _LibBalsaAddressBookTextClass {
                                     LibBalsaAddress *address);
 };
 
-typedef struct _LibBalsaAddressBookText LibBalsaAddressBookText;
-typedef struct _LibBalsaAddressBookTextClass LibBalsaAddressBookTextClass;
-
 /*
  * Getter
  */
diff --git a/libbalsa/address-book.h b/libbalsa/address-book.h
index 44b88ea..244532f 100644
--- a/libbalsa/address-book.h
+++ b/libbalsa/address-book.h
@@ -41,9 +41,6 @@ typedef enum {
     LBABERR_ADDRESS_NOT_FOUND
 } LibBalsaABErr;
 
-typedef struct _LibBalsaAddressBook LibBalsaAddressBook;
-typedef struct _LibBalsaAddressBookClass LibBalsaAddressBookClass;
-
 typedef LibBalsaABErr (*LibBalsaAddressBookLoadFunc)(LibBalsaAddressBook *ab,
                                                      LibBalsaAddress     *address,
                                                      gpointer             closure);
diff --git a/src/balsa-message.h b/src/balsa-message.h
index 1bc8fbd..236b3f6 100644
--- a/src/balsa-message.h
+++ b/src/balsa-message.h
@@ -38,10 +38,8 @@ G_DECLARE_FINAL_TYPE(BalsaMessage,
                      MESSAGE,
                      GtkBox);
 
-
-typedef struct _BalsaPartInfo BalsaPartInfo;
-
-typedef struct _BalsaMimeWidget BalsaMimeWidget;
+/* Now that BalsaMessage has been declared, we can: */
+#include "balsa-mime-widget.h"
 
 typedef enum {
     BALSA_MESSAGE_FOCUS_STATE_NO,
diff --git a/src/balsa-print-object-decor.h b/src/balsa-print-object-decor.h
index f3eeb77..a8e13b4 100644
--- a/src/balsa-print-object-decor.h
+++ b/src/balsa-print-object-decor.h
@@ -25,6 +25,7 @@
 G_BEGIN_DECLS
 
 #define BALSA_TYPE_PRINT_OBJECT_DECOR balsa_print_object_decor_get_type()
+
 G_DECLARE_FINAL_TYPE(BalsaPrintObjectDecor,
                      balsa_print_object_decor,
                      BALSA,
diff --git a/src/balsa-print-object-header.h b/src/balsa-print-object-header.h
index 46a8ad6..bdef2b4 100644
--- a/src/balsa-print-object-header.h
+++ b/src/balsa-print-object-header.h
@@ -29,6 +29,7 @@
 G_BEGIN_DECLS
 
 #define BALSA_TYPE_PRINT_OBJECT_HEADER balsa_print_object_header_get_type()
+
 G_DECLARE_FINAL_TYPE(BalsaPrintObjectHeader,
                      balsa_print_object_header,
                      BALSA,


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