static void
cache_invalidate (PsppireDelimitedText *tf)
{
- memset (tf->cache_starts, 0, 512);
+ memset (tf->cache_starts, 0, sizeof tf->cache_starts);
if (tf->const_cache.string)
{
ss_dealloc (&tf->const_cache);
};
}
-
-static void psppire_delimited_text_init (PsppireDelimitedText *text_file);
-static void psppire_delimited_text_class_init (PsppireDelimitedTextClass *class);
-
static void psppire_delimited_text_finalize (GObject *object);
static void psppire_delimited_text_dispose (GObject *object);
return;
}
- memset (file->cache_starts, 0, 512);
+ memset (file->cache_starts, 0, sizeof file->cache_starts);
/* Cache miss */
if (file->const_cache.string)
{
iface->iter_parent = __iter_parent;
}
-
-GType
-psppire_delimited_text_get_type (void)
-{
- static GType text_file_type = 0;
-
- if (!text_file_type)
- {
- static const GTypeInfo text_file_info =
- {
- sizeof (PsppireDelimitedTextClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) psppire_delimited_text_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (PsppireDelimitedText),
- 0,
- (GInstanceInitFunc) psppire_delimited_text_init,
- };
-
- static const GInterfaceInfo tree_model_info = {
- (GInterfaceInitFunc) __tree_model_init,
- NULL,
- NULL
- };
-
- text_file_type = g_type_register_static (G_TYPE_OBJECT,
- "PsppireDelimitedText",
- &text_file_info, 0);
-
- g_type_add_interface_static (text_file_type, GTK_TYPE_TREE_MODEL,
- &tree_model_info);
- }
-
- return text_file_type;
-}
-
+G_DEFINE_TYPE_WITH_CODE (PsppireDelimitedText, psppire_delimited_text, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+ __tree_model_init))
static void
psppire_delimited_text_class_init (PsppireDelimitedTextClass *class)
GObjectClass *object_class;
parent_class = g_type_class_peek_parent (class);
- object_class = (GObjectClass*) class;
+ object_class = G_OBJECT_CLASS (class);
GParamSpec *first_line_spec =
g_param_spec_int ("first-line",
text_file->const_cache.string = NULL;
text_file->const_cache.length = 0;
text_file->cache_row = -1;
- memset (text_file->cache_starts, 0, 512);
+ memset (text_file->cache_starts, 0, sizeof text_file->cache_starts);
text_file->max_delimiters = 0;