convert to GObject

5 files changed, 99 insertions, 0 deletions

diff --git a/include/libmsi-database.h b/include/libmsi-database.h
index a8199ab..eb92c01 100644
--- a/include/libmsi-database.h
+++ b/include/libmsi-database.h
@@ -19,8 +19,30 @@
 #ifndef _LIBMSI_DATABASE_H
 #define _LIBMSI_DATABASE_H
 
+#include <glib-object.h>
+
 #include "libmsi-types.h"
 
+G_BEGIN_DECLS
+
+#define LIBMSI_TYPE_DATABASE             (libmsi_database_get_type ())
+#define LIBMSI_DATABASE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBMSI_TYPE_DATABASE, LibmsiDatabase))
+#define LIBMSI_DATABASE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LIBMSI_TYPE_DATABASE, LibmsiDatabaseClass))
+#define LIBMSI_IS_DATABASE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBMSI_TYPE_DATABASE))
+#define LIBMSI_IS_DATABASE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBMSI_TYPE_DATABASE))
+#define LIBMSI_DATABASE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBMSI_TYPE_DATABASE, LibmsiDatabaseClass))
+
+typedef struct _LibmsiDatabaseClass LibmsiDatabaseClass;
+
+struct _LibmsiDatabaseClass
+{
+    GObjectClass parent_class;
+};
+
+GType libmsi_database_get_type (void) G_GNUC_CONST;
+
+
+LibmsiDatabase *    libmsi_database_new (const gchar *path, const char *persist, GError **error);
 LibmsiResult        libmsi_database_open (const char *, const char *, LibmsiDatabase **);
 LibmsiResult        libmsi_database_open_query (LibmsiDatabase *,const char *,LibmsiQuery **);
 LibmsiDBState       libmsi_database_get_state (LibmsiDatabase *);
@@ -33,4 +55,7 @@ LibmsiResult        libmsi_database_merge (LibmsiDatabase *, LibmsiDatabase *, c
 LibmsiResult        libmsi_database_get_summary_info (LibmsiDatabase *, unsigned, LibmsiSummaryInfo **);
 LibmsiResult        libmsi_database_commit (LibmsiDatabase *);
 
+
+G_END_DECLS
+
 #endif /* _LIBMSI_DATABASE_H */
diff --git a/include/libmsi-query.h b/include/libmsi-query.h
index e473769..673f0cb 100644
--- a/include/libmsi-query.h
+++ b/include/libmsi-query.h
@@ -19,12 +19,37 @@
 #ifndef _LIBMSI_QUERY_H
 #define _LIBMSI_QUERY_H
 
+#include <glib-object.h>
+
 #include "libmsi-types.h"
 
+G_BEGIN_DECLS
+
+#define LIBMSI_TYPE_QUERY             (libmsi_query_get_type ())
+#define LIBMSI_QUERY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBMSI_TYPE_QUERY, LibmsiQuery))
+#define LIBMSI_QUERY_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LIBMSI_TYPE_QUERY, LibmsiQueryClass))
+#define LIBMSI_IS_QUERY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBMSI_TYPE_QUERY))
+#define LIBMSI_IS_QUERY_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBMSI_TYPE_QUERY))
+#define LIBMSI_QUERY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBMSI_TYPE_QUERY, LibmsiQueryClass))
+
+typedef struct _LibmsiQueryClass LibmsiQueryClass;
+
+struct _LibmsiQueryClass
+{
+    GObjectClass parent_class;
+};
+
+GType libmsi_query_get_type (void) G_GNUC_CONST;
+
+
+LibmsiQuery *     libmsi_query_new (LibmsiDatabase *database, const char *query, GError **error);
+
 LibmsiResult      libmsi_query_fetch (LibmsiQuery *,LibmsiRecord **);
 LibmsiResult      libmsi_query_execute (LibmsiQuery *,LibmsiRecord *);
 LibmsiResult      libmsi_query_close (LibmsiQuery *);
 LibmsiDBError     libmsi_query_get_error (LibmsiQuery *,char *,unsigned *);
 LibmsiResult      libmsi_query_get_column_info (LibmsiQuery *, LibmsiColInfo, LibmsiRecord **);
 
+G_END_DECLS
+
 #endif /* _LIBMSI_QUERY_H */
diff --git a/include/libmsi-record.h b/include/libmsi-record.h
index 0b21019..ab3f078 100644
--- a/include/libmsi-record.h
+++ b/include/libmsi-record.h
@@ -19,8 +19,28 @@
 #ifndef _LIBMSI_RECORD_H
 #define _LIBMSI_RECORD_H
 
+#include <glib-object.h>
+
 #include "libmsi-types.h"
 
+G_BEGIN_DECLS
+
+#define LIBMSI_TYPE_RECORD             (libmsi_record_get_type ())
+#define LIBMSI_RECORD(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBMSI_TYPE_RECORD, LibmsiRecord))
+#define LIBMSI_RECORD_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LIBMSI_TYPE_RECORD, LibmsiRecordClass))
+#define LIBMSI_IS_RECORD(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBMSI_TYPE_RECORD))
+#define LIBMSI_IS_RECORD_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBMSI_TYPE_RECORD))
+#define LIBMSI_RECORD_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBMSI_TYPE_RECORD, LibmsiRecordClass))
+
+typedef struct _LibmsiRecordClass LibmsiRecordClass;
+
+struct _LibmsiRecordClass
+{
+    GObjectClass parent_class;
+};
+
+GType libmsi_record_get_type (void) G_GNUC_CONST;
+
 LibmsiRecord *    libmsi_record_new (guint count);
 LibmsiResult      libmsi_record_clear_data (LibmsiRecord *);
 LibmsiResult      libmsi_record_set_int (LibmsiRecord *,unsigned,int);
@@ -34,4 +54,6 @@ gboolean          libmsi_record_is_null (const LibmsiRecord *,unsigned);
 LibmsiResult      libmsi_record_load_stream (LibmsiRecord *,unsigned,const char *);
 LibmsiResult      libmsi_record_save_stream (LibmsiRecord *,unsigned,char*,unsigned *);
 
+G_END_DECLS
+
 #endif /* _LIBMSI_RECORD_H */
diff --git a/include/libmsi-summary-info.h b/include/libmsi-summary-info.h
index 41036a0..1f289d7 100644
--- a/include/libmsi-summary-info.h
+++ b/include/libmsi-summary-info.h
@@ -19,12 +19,35 @@
 #ifndef _LIBMSI_SUMMARY_INFO_H
 #define _LIBMSI_SUMMARY_INFO_H
 
+#include <glib-object.h>
+
 #include "libmsi-types.h"
 
+G_BEGIN_DECLS
+
+#define LIBMSI_TYPE_SUMMARY_INFO             (libmsi_summary_info_get_type ())
+#define LIBMSI_SUMMARY_INFO(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBMSI_TYPE_SUMMARY_INFO, LibmsiSummaryInfo))
+#define LIBMSI_SUMMARY_INFO_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LIBMSI_TYPE_SUMMARY_INFO, LibmsiSummaryInfoClass))
+#define LIBMSI_IS_SUMMARY_INFO(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBMSI_TYPE_SUMMARY_INFO))
+#define LIBMSI_IS_SUMMARY_INFO_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBMSI_TYPE_SUMMARY_INFO))
+#define LIBMSI_SUMMARY_INFO_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBMSI_TYPE_SUMMARY_INFO, LibmsiSummaryInfoClass))
+
+typedef struct _LibmsiSummaryInfoClass LibmsiSummaryInfoClass;
+
+struct _LibmsiSummaryInfoClass
+{
+    GObjectClass parent_class;
+};
+
+GType libmsi_summary_info_get_type (void) G_GNUC_CONST;
+
 LibmsiSummaryInfo *   libmsi_summary_info_new (LibmsiDatabase *database, unsigned update_count, GError **error);
 LibmsiResult          libmsi_summary_info_get_property (LibmsiSummaryInfo *, LibmsiPropertyType,unsigned *,int *,guint64*,char *,unsigned *);
 LibmsiResult          libmsi_summary_info_set_property (LibmsiSummaryInfo *, LibmsiPropertyType, unsigned, int, guint64*, const char *);
 LibmsiResult          libmsi_summary_info_persist (LibmsiSummaryInfo *);
 LibmsiResult          libmsi_summary_info_get_property_count (LibmsiSummaryInfo *,unsigned *);
 
+
+G_END_DECLS
+
 #endif /* _LIBMSI_SUMMARY_INFO_H */
diff --git a/include/libmsi-types.h b/include/libmsi-types.h
index 71f01e7..ca7e04e 100644
--- a/include/libmsi-types.h
+++ b/include/libmsi-types.h
@@ -21,6 +21,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef struct _LibmsiDatabase LibmsiDatabase;
 typedef struct _LibmsiQuery LibmsiQuery;
 typedef struct _LibmsiRecord LibmsiRecord;
@@ -150,4 +152,6 @@ typedef enum LibmsiDBState
 #define MSI_PID_MSISOURCE MSI_PID_WORDCOUNT
 #define MSI_PID_MSIRESTRICT MSI_PID_CHARCOUNT
 
+G_END_DECLS
+
 #endif /* _LIBMSI_TYPES_H */