[couchdb-glib: 13/21] Move typedefs of instance structs to couchdb-types.h

[Mikkel Kamstrup Erlandsen <kamstrup src gnome org>]

commit 4da4cf293ad846b107e61eca0bb46fccf080d22c
Author: Mikkel Kamstrup Erlandsen <mikkel kamstrup gmail com>
Date:   Mon Oct 5 22:22:24 2009 +0200

    Move typedefs of instance structs to couchdb-types.h

 NOTES.kamstrup                       |    7 +++++++
 couchdb-glib/couchdb-database-info.h |    2 +-
 couchdb-glib/couchdb-document-info.h |    4 +---
 couchdb-glib/couchdb-struct-field.h  |    4 +---
 couchdb-glib/couchdb-types.h         |    4 +++-
 5 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/NOTES.kamstrup b/NOTES.kamstrup
index d936659..291d23a 100644
--- a/NOTES.kamstrup
+++ b/NOTES.kamstrup
@@ -1,5 +1,12 @@
 TODO:
+-----
 Move typedefs to couchdb-types.h
+Silent build rules
+Single header includes
+? Get rid of CouchDBStructField ?
+
+DONE:
+-----
 
 In couchdb.*:
  * Don't make API depend on whether we are configured with OAUTH
diff --git a/couchdb-glib/couchdb-database-info.h b/couchdb-glib/couchdb-database-info.h
index 2d955f6..d2361bd 100644
--- a/couchdb-glib/couchdb-database-info.h
+++ b/couchdb-glib/couchdb-database-info.h
@@ -26,6 +26,7 @@
  
 #include <glib.h>
 #include <glib-object.h>
+#include "couchdb-types.h"
 
 G_BEGIN_DECLS
 
@@ -34,7 +35,6 @@ G_BEGIN_DECLS
 /*
  * CouchDBDatabaseInfo
  */
-typedef struct _CouchDBDatabaseInfo CouchDBDatabaseInfo;
 
 GType                couchdb_database_info_get_type (void);
 CouchDBDatabaseInfo *couchdb_database_info_ref (CouchDBDatabaseInfo *dbinfo);
diff --git a/couchdb-glib/couchdb-document-info.h b/couchdb-glib/couchdb-document-info.h
index e112090..6a8ad8c 100644
--- a/couchdb-glib/couchdb-document-info.h
+++ b/couchdb-glib/couchdb-document-info.h
@@ -26,14 +26,12 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include "couchdb-types.h"
 
 G_BEGIN_DECLS
 
 #define COUCHDB_TYPE_DOCUMENT_INFO (couchdb_document_info_get_type ())
 
-
-typedef struct _CouchDBDocumentInfo CouchDBDocumentInfo;
-
 GType                couchdb_document_info_get_type (void);
 CouchDBDocumentInfo *couchdb_document_info_new (const char *docid, const char *revision);
 CouchDBDocumentInfo *couchdb_document_info_ref (CouchDBDocumentInfo *dbinfo);
diff --git a/couchdb-glib/couchdb-struct-field.h b/couchdb-glib/couchdb-struct-field.h
index 707ebdf..6039053 100644
--- a/couchdb-glib/couchdb-struct-field.h
+++ b/couchdb-glib/couchdb-struct-field.h
@@ -28,14 +28,12 @@
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
 #include "couchdb.h"
-#include "couchdb-struct-field.h"
+#include "couchdb-types.h"
 
 G_BEGIN_DECLS
 
 #define COUCHDB_TYPE_STRUCT_FIELD  (couchdb_struct_field_get_type ())
 
-typedef struct _CouchDBStructField CouchDBStructField;
-
 GType               couchdb_struct_field_get_type (void);
 CouchDBStructField *couchdb_struct_field_new (void);
 CouchDBStructField *couchdb_struct_field_new_from_string (const char *str);
diff --git a/couchdb-glib/couchdb-types.h b/couchdb-glib/couchdb-types.h
index 3b1aabd..6983ebe 100644
--- a/couchdb-glib/couchdb-types.h
+++ b/couchdb-glib/couchdb-types.h
@@ -30,7 +30,9 @@ G_BEGIN_DECLS
 
 typedef struct _CouchDBDocument CouchDBDocument;
 typedef struct _CouchDB CouchDB;
-
+typedef struct _CouchDBDatabaseInfo CouchDBDatabaseInfo;
+typedef struct _CouchDBDocumentInfo CouchDBDocumentInfo;
+typedef struct _CouchDBStructField CouchDBStructField;
 
 G_END_DECLS