diff options
| author | Murray Cumming <murrayc@src.gnome.org> | 2005-01-21 12:48:06 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2005-01-21 12:48:06 +0000 |
| commit | a8e848b1f08e71f376ddfce775794c7056609f23 (patch) | |
| tree | da3afa00b8a0d9e09245cc7e7769db014fe6f418 /glib/src/markup.ccg | |
| parent | 477ea23168b754530c508e31729d29bc309a4b13 (diff) | |
| download | glibmm-a8e848b1f08e71f376ddfce775794c7056609f23.tar.gz | |
Temporarily reverted some stuff. I will recommit some of it.
Diffstat (limited to 'glib/src/markup.ccg')
| -rw-r--r-- | glib/src/markup.ccg | 55 |
1 files changed, 42 insertions, 13 deletions
diff --git a/glib/src/markup.ccg b/glib/src/markup.ccg index 4b19f84e..2b61a358 100644 --- a/glib/src/markup.ccg +++ b/glib/src/markup.ccg @@ -51,19 +51,47 @@ class ParserCallbacks { public: static const GMarkupParser vfunc_table; + + static void start_element(GMarkupParseContext* context, + const char* element_name, + const char** attribute_names, + const char** attribute_values, + void* user_data, + GError** error); + + static void end_element(GMarkupParseContext* context, + const char* element_name, + void* user_data, + GError** error); + + static void text(GMarkupParseContext* context, + const char* text, + gsize text_len, + void* user_data, + GError** error); + + static void passthrough(GMarkupParseContext* context, + const char* passthrough_text, + gsize text_len, + void* user_data, + GError** error); + + static void error(GMarkupParseContext* context, + GError* error, + void* user_data); }; const GMarkupParser ParserCallbacks::vfunc_table = { - &ParserCallbacks_start_element, - &ParserCallbacks_end_element, - &ParserCallbacks_text, - &ParserCallbacks_passthrough, - &ParserCallbacks_error, + &ParserCallbacks::start_element, + &ParserCallbacks::end_element, + &ParserCallbacks::text, + &ParserCallbacks::passthrough, + &ParserCallbacks::error, }; -void ParserCallbacks_start_element(GMarkupParseContext* context, +void ParserCallbacks::start_element(GMarkupParseContext* context, const char* element_name, const char** attribute_names, const char** attribute_values, @@ -100,7 +128,7 @@ void ParserCallbacks_start_element(GMarkupParseContext* context, } } -void ParserCallbacks_end_element(GMarkupParseContext* context, +void ParserCallbacks::end_element(GMarkupParseContext* context, const char* element_name, void* user_data, GError** error) @@ -122,7 +150,7 @@ void ParserCallbacks_end_element(GMarkupParseContext* context, } } -void ParserCallbacks_text(GMarkupParseContext* context, +void ParserCallbacks::text(GMarkupParseContext* context, const char* text, gsize text_len, void* user_data, @@ -145,7 +173,7 @@ void ParserCallbacks_text(GMarkupParseContext* context, } } -void ParserCallbacks_passthrough(GMarkupParseContext* context, +void ParserCallbacks::passthrough(GMarkupParseContext* context, const char* passthrough_text, gsize text_len, void* user_data, @@ -169,7 +197,7 @@ void ParserCallbacks_passthrough(GMarkupParseContext* context, } } -void ParserCallbacks_error(GMarkupParseContext* context, +void ParserCallbacks::error(GMarkupParseContext* context, GError* error, void* user_data) { @@ -219,7 +247,7 @@ ParseContext::ParseContext(Parser& parser, ParseFlags flags) : parser_ (&parser), gobject_ (g_markup_parse_context_new(&ParserCallbacks::vfunc_table, (GMarkupParseFlags) flags, - this, &ParseContext_destroy_notify_callback)) + this, &ParseContext::destroy_notify_callback)) {} ParseContext::~ParseContext() @@ -274,8 +302,9 @@ int ParseContext::get_char_number() const g_markup_parse_context_get_position(gobject_, 0, &char_number); return char_number; } - -void ParseContext_destroy_notify_callback(void* data) + +// static +void ParseContext::destroy_notify_callback(void* data) { ParseContext *const self = static_cast<ParseContext*>(data); |