dee-model.h   dee-model.h 
skipping to change at line 41 skipping to change at line 41
G_BEGIN_DECLS G_BEGIN_DECLS
#define DEE_TYPE_MODEL_ITER (dee_model_iter_get_type ()) #define DEE_TYPE_MODEL_ITER (dee_model_iter_get_type ())
#define DEE_TYPE_MODEL (dee_model_get_type ()) #define DEE_TYPE_MODEL (dee_model_get_type ())
#define DEE_MODEL(obj) \ #define DEE_MODEL(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), DEE_TYPE_MODEL, DeeModel)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEE_TYPE_MODEL, DeeModel))
#define DEE_IS_MODEL(obj) \ #define DEE_IS_MODEL(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEE_TYPE_MODEL)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEE_TYPE_MODEL))
#define DEE_MODEL_GET_IFACE(obj) \ #define DEE_MODEL_GET_IFACE(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE(obj, dee_model_get_type (), DeeModelI face)) (G_TYPE_INSTANCE_GET_INTERFACE(obj, dee_model_get_type (), DeeModel Iface))
typedef struct _DeeModelIface DeeModelIface; typedef struct _DeeModelIface DeeModelIface;
typedef struct _DeeModel DeeModel; typedef struct _DeeModel DeeModel;
/** /**
* DeeModelIter: * DeeModelIter:
* *
* The DeeModelIter structure is private and should only be used with the * The DeeModelIter structure is private and should only be used with the
* provided #DeeModel API. It is owned by DeeModel and should not be freed. * provided #DeeModel API. It is owned by DeeModel and should not be freed.
**/ **/
skipping to change at line 117 skipping to change at line 117
void (*row_added) (DeeModel *self, void (*row_added) (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
void (*row_removed) (DeeModel *self, void (*row_removed) (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
void (*row_changed) (DeeModel *self, void (*row_changed) (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
/*< public >*/ /*< public >*/
void (*set_schema_full) (DeeModel *self, void (*set_schema_full) (DeeModel *self,
const char* const *column_schemas, const char* const *column_schemas,
guint num_columns); guint num_columns);
const gchar* const* (*get_schema) (DeeModel *self, const gchar* const* (*get_schema) (DeeModel *self,
guint *num_columns); guint *num_columns);
const gchar* (*get_column_schema) (DeeModel *self, const gchar* (*get_column_schema) (DeeModel *self,
guint column); guint column);
const gchar* (*get_field_schema) (DeeModel *self,
const gchar *field_name,
guint *out_column);
gint (*get_column_index) (DeeModel *self,
const gchar *column_name);
void (*set_column_names_full) (DeeModel *self,
const gchar **column_names,
guint num_columns);
const gchar** (*get_column_names) (DeeModel *self,
guint *num_columns);
void (*register_vardict_schema) (DeeModel *self,
guint num_column,
GHashTable *schemas);
GHashTable* (*get_vardict_schema) (DeeModel *self,
guint num_column);
guint (*get_n_columns) (DeeModel *self); guint (*get_n_columns) (DeeModel *self);
guint (*get_n_rows) (DeeModel *self); guint (*get_n_rows) (DeeModel *self);
DeeModelIter* (*append_row) (DeeModel *self, DeeModelIter* (*append_row) (DeeModel *self,
GVariant **row_members); GVariant **row_members);
DeeModelIter* (*prepend_row) (DeeModel *self, DeeModelIter* (*prepend_row) (DeeModel *self,
GVariant **row_members); GVariant **row_members);
skipping to change at line 174 skipping to change at line 195
GVariant *value); GVariant *value);
void (*set_row) (DeeModel *self, void (*set_row) (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
GVariant **row_members); GVariant **row_members);
GVariant* (*get_value) (DeeModel *self, GVariant* (*get_value) (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
guint column); guint column);
GVariant* (*get_value_by_name) (DeeModel *self,
DeeModelIter *iter,
const gchar *column_name);
DeeModelIter* (*get_first_iter) (DeeModel *self); DeeModelIter* (*get_first_iter) (DeeModel *self);
DeeModelIter* (*get_last_iter) (DeeModel *self); DeeModelIter* (*get_last_iter) (DeeModel *self);
DeeModelIter* (*get_iter_at_row) (DeeModel *self, DeeModelIter* (*get_iter_at_row) (DeeModel *self,
guint row); guint row);
gboolean (*get_bool) (DeeModel *self, gboolean (*get_bool) (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
guint column); guint column);
skipping to change at line 244 skipping to change at line 269
void (*set_tag) (DeeModel *self, void (*set_tag) (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
DeeModelTag *tag, DeeModelTag *tag,
gpointer value); gpointer value);
GVariant** (*get_row) (DeeModel *self, GVariant** (*get_row) (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
GVariant **out_row_members); GVariant **out_row_members);
void (*begin_changeset) (DeeModel *self);
void (*end_changeset) (DeeModel *self);
void (*changeset_started) (DeeModel *self);
void (*changeset_finished) (DeeModel *self);
/*< private >*/ /*< private >*/
void (*_dee_model_1) (void); void (*_dee_model_1) (void);
void (*_dee_model_2) (void); void (*_dee_model_2) (void);
void (*_dee_model_3) (void); void (*_dee_model_3) (void);
void (*_dee_model_4) (void);
void (*_dee_model_5) (void);
void (*_dee_model_6) (void);
void (*_dee_model_7) (void);
}; };
GType dee_model_iter_get_type (void); GType dee_model_iter_get_type (void);
/** /**
* dee_model_get_type: * dee_model_get_type:
* *
* The GType of #DeeModel * The GType of #DeeModel
* *
* Return value: the #GType of #DeeModel * Return value: the #GType of #DeeModel
skipping to change at line 278 skipping to change at line 307
void dee_model_set_schema_full (DeeModel *self, void dee_model_set_schema_full (DeeModel *self,
const gchar* const *column _schemas, const gchar* const *column _schemas,
guint num_co lumns); guint num_co lumns);
const gchar* const* dee_model_get_schema (DeeModel *self, const gchar* const* dee_model_get_schema (DeeModel *self,
guint *num_columns); guint *num_columns);
const gchar* dee_model_get_column_schema (DeeModel *self, const gchar* dee_model_get_column_schema (DeeModel *self,
guint column); guint column);
const gchar* dee_model_get_field_schema (DeeModel *self,
const gchar *field_name,
guint *out_column);
gint dee_model_get_column_index (DeeModel *self,
const gchar *column_name);
void dee_model_set_column_names (DeeModel *self,
const gchar *first_column
_name,
...) G_GNUC_NULL_TERMINATE
D;
void dee_model_set_column_names_full (DeeModel *self,
const gchar **column_names
,
guint num_columns)
;
const gchar** dee_model_get_column_names (DeeModel *self,
guint *num_columns)
;
void dee_model_register_vardict_schema (DeeModel *self,
guint column,
GHashTable *schemas);
GHashTable* dee_model_get_vardict_schema (DeeModel *self,
guint column);
guint dee_model_get_n_columns (DeeModel *self); guint dee_model_get_n_columns (DeeModel *self);
guint dee_model_get_n_rows (DeeModel *self); guint dee_model_get_n_rows (DeeModel *self);
DeeModelIter* dee_model_append (DeeModel *self, DeeModelIter* dee_model_append (DeeModel *self,
...); ...);
DeeModelIter* dee_model_append_row (DeeModel *self, DeeModelIter* dee_model_append_row (DeeModel *self,
GVariant **row_members); GVariant **row_members);
skipping to change at line 373 skipping to change at line 427
...); ...);
GVariant** dee_model_get_row (DeeModel *self, GVariant** dee_model_get_row (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
GVariant **out_row_members); GVariant **out_row_members);
GVariant* dee_model_get_value (DeeModel *self, GVariant* dee_model_get_value (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
guint column); guint column);
GVariant* dee_model_get_value_by_name (DeeModel *self,
DeeModelIter *iter,
const gchar *column_name);
DeeModelIter* dee_model_get_first_iter (DeeModel *self); DeeModelIter* dee_model_get_first_iter (DeeModel *self);
DeeModelIter* dee_model_get_last_iter (DeeModel *self); DeeModelIter* dee_model_get_last_iter (DeeModel *self);
DeeModelIter* dee_model_get_iter_at_row (DeeModel *self, DeeModelIter* dee_model_get_iter_at_row (DeeModel *self,
guint row); guint row);
gboolean dee_model_get_bool (DeeModel *self, gboolean dee_model_get_bool (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
guint column); guint column);
guchar dee_model_get_uchar (DeeModel *self, guchar dee_model_get_uchar (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
guint column); guint column);
gint32 dee_model_get_int32 (DeeModel *self, gint32 dee_model_get_int32 (DeeModel *self,
skipping to change at line 412 skipping to change at line 470
guint column); guint column);
gdouble dee_model_get_double (DeeModel *self, gdouble dee_model_get_double (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
guint column); guint column);
const gchar * dee_model_get_string (DeeModel *self, const gchar * dee_model_get_string (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
guint column); guint column);
DeeModelIter * dee_model_next (DeeModel *self, DeeModelIter * dee_model_next (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
DeeModelIter * dee_model_prev (DeeModel *self, DeeModelIter * dee_model_prev (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
gboolean dee_model_is_first (DeeModel *self, gboolean dee_model_is_first (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
gboolean dee_model_is_last (DeeModel *self, gboolean dee_model_is_last (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
guint dee_model_get_position (DeeModel *self, guint dee_model_get_position (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
skipping to change at line 443 skipping to change at line 501
void dee_model_set_tag (DeeModel *self, void dee_model_set_tag (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
DeeModelTag *tag, DeeModelTag *tag,
gpointer value); gpointer value);
void dee_model_clear_tag (DeeModel *self, void dee_model_clear_tag (DeeModel *self,
DeeModelIter *iter, DeeModelIter *iter,
DeeModelTag *tag); DeeModelTag *tag);
GVariant** dee_model_build_row (DeeModel *self, void dee_model_begin_changeset (DeeModel *self);
GVariant **out_row_members,
...); void dee_model_end_changeset (DeeModel *self);
GVariant** dee_model_build_row (DeeModel *self,
GVariant **out_row_members,
...);
GVariant** dee_model_build_named_row (DeeModel *self,
GVariant **out_row_members,
const gchar *first_column_name,
...) G_GNUC_NULL_TERMINATED;
GVariant** dee_model_build_named_row_valist (DeeModel *self,
GVariant **out_row_memb
ers,
const gchar *first_column
_name,
va_list *args);
GVariant** dee_model_build_named_row_sunk (DeeModel *self,
GVariant **out_row_memb
ers,
guint *out_array_le
ngth,
const gchar *first_column
_name,
...) G_GNUC_NULL_TERMINAT
ED;
G_END_DECLS G_END_DECLS
#endif /* _HAVE_DEE_MODEL_H */ #endif /* _HAVE_DEE_MODEL_H */
 End of changes. 13 change blocks. 
15 lines changed or deleted 104 lines changed or added


 dee-shared-model.h   dee-shared-model.h 
skipping to change at line 119 skipping to change at line 119
/** /**
* dee_shared_model_access_mode_get_type: * dee_shared_model_access_mode_get_type:
* *
* The GType of #DeeSharedModelAccessMode * The GType of #DeeSharedModelAccessMode
* *
* Return value: the #GType of #DeeSharedModelAccessMode * Return value: the #GType of #DeeSharedModelAccessMode
**/ **/
GType dee_shared_model_access_mode_get_type (void); GType dee_shared_model_access_mode_get_type (void);
#define DEE_TYPE_SHARED_MODEL_FLUSH_MODE \
(dee_shared_model_flush_mode_get_type ())
/**
* DeeSharedModelFlushMode:
*
* Enumeration defining flushing behavior of a shared model.
*/
typedef enum
{
DEE_SHARED_MODEL_FLUSH_MODE_AUTOMATIC,
DEE_SHARED_MODEL_FLUSH_MODE_MANUAL
} DeeSharedModelFlushMode;
/**
* dee_shared_model_flush_mode_get_type:
*
* The GType of #DeeSharedModelFlushMode
*
* Return value: the #GType of #DeeSharedModelFlushMode
**/
GType dee_shared_model_flush_mode_get_type (void);
/** /**
* dee_shared_model_get_type: * dee_shared_model_get_type:
* *
* The GType of #DeeSharedModel * The GType of #DeeSharedModel
* *
* Return value: the #GType of #DeeSharedModel * Return value: the #GType of #DeeSharedModel
**/ **/
GType dee_shared_model_get_type (void); GType dee_shared_model_get_type (void);
DeeModel* dee_shared_model_new (const gchar *name); DeeModel* dee_shared_model_new (const gchar *name);
skipping to change at line 147 skipping to change at line 170
DeePeer* dee_shared_model_get_peer (DeeSharedModel *sel f); DeePeer* dee_shared_model_get_peer (DeeSharedModel *sel f);
gboolean dee_shared_model_is_leader (DeeSharedModel *sel f); gboolean dee_shared_model_is_leader (DeeSharedModel *sel f);
gboolean dee_shared_model_is_synchronized (DeeSharedModel *sel f); gboolean dee_shared_model_is_synchronized (DeeSharedModel *sel f);
guint dee_shared_model_flush_revision_queue guint dee_shared_model_flush_revision_queue
(DeeSharedModel *sel f); (DeeSharedModel *sel f);
guint dee_shared_model_flush_revision_queue_sync
(DeeSharedModel *sel
f);
void dee_shared_model_set_flush_mode (DeeSharedModel *sel
f,
DeeSharedModelFlush
Mode mode);
DeeSharedModelFlushMode dee_shared_model_get_flush_mode (DeeSharedModel *se
lf);
G_END_DECLS G_END_DECLS
#endif /* _HAVE_DEE_SHARED_MODEL_H */ #endif /* _HAVE_DEE_SHARED_MODEL_H */
 End of changes. 2 change blocks. 
0 lines changed or deleted 35 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/