Revision: 4552 http://geany.svn.sourceforge.net/geany/?rev=4552&view=rev Author: ntrel Date: 2010-01-25 15:53:54 +0000 (Mon, 25 Jan 2010)
Log Message: ----------- Use full function name for GeanyFunctions function pointers. This avoids naming conflicts e.g. with C++'s 'new' keyword. Remove deprecated header pluginmacros.h - use geanyfunctions.h instead.
Modified Paths: -------------- trunk/ChangeLog trunk/doc/Doxyfile.in trunk/doc/pluginsymbols.c trunk/plugins/Makefile.am trunk/plugins/geanyfunctions.h trunk/plugins/genapi.py trunk/src/highlighting.c trunk/src/highlighting.h trunk/src/plugindata.h trunk/src/sciwrappers.c trunk/wscript
Removed Paths: ------------- trunk/plugins/pluginmacros.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/ChangeLog 2010-01-25 15:53:54 UTC (rev 4552) @@ -1,3 +1,14 @@ +2010-01-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c, src/highlighting.h, src/sciwrappers.c, + src/plugindata.h, doc/Doxyfile.in, doc/pluginsymbols.c, + plugins/geanyfunctions.h, plugins/Makefile.am, + plugins/pluginmacros.h, plugins/genapi.py, ChangeLog, wscript: + Use full function name for GeanyFunctions function pointers. This + avoids naming conflicts e.g. with C++'s 'new' keyword. + Remove deprecated header pluginmacros.h - use geanyfunctions.h instead. + + 2010-01-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/utils.c, src/utils.h, src/vte.c: @@ -12,7 +23,7 @@ Replace the old icons with smiley icons from the Rodent icon theme. Fix showing the same icon for two or more slots. Minor cleanups. - * src/editor.c, src/editor.j, src/keybindings.c: + * src/editor.c, src/editor.h, src/keybindings.c: Rename fold_symbol_click() to editor_toggle_fold(). Use editor_toggle_fold() when the 'Toggle current fold' keybinding was used to respect the 'Fold/unfold all children' preference
Modified: trunk/doc/Doxyfile.in =================================================================== --- trunk/doc/Doxyfile.in 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/doc/Doxyfile.in 2010-01-25 15:53:54 UTC (rev 4552) @@ -95,7 +95,7 @@ # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = ../src/ ./ \ - ../plugins/pluginmacros.h ../plugins/geanyplugin.h ../plugins/geanyfunctions.h \ + ../plugins/geanyplugin.h ../plugins/geanyfunctions.h \ ../tagmanager/tm_source_file.c ../tagmanager/include/tm_source_file.h \ ../tagmanager/tm_work_object.c ../tagmanager/include/tm_work_object.h \ ../tagmanager/tm_workspace.c ../tagmanager/include/tm_workspace.h
Modified: trunk/doc/pluginsymbols.c =================================================================== --- trunk/doc/pluginsymbols.c 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/doc/pluginsymbols.c 2010-01-25 15:53:54 UTC (rev 4552) @@ -58,7 +58,7 @@ * Example: @code #include "geanyfunctions.h" * ... * document_new_file(NULL, NULL, NULL); @endcode - * This is equivalent of @c geany_functions->p_document->new_file(NULL, NULL, NULL); */ + * This is equivalent of @c geany_functions->p_document->document_new_file(NULL, NULL, NULL); */ const GeanyFunctions *geany_functions;
/** @deprecated Use @ref ui_add_document_sensitive() instead.
Modified: trunk/plugins/Makefile.am =================================================================== --- trunk/plugins/Makefile.am 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/plugins/Makefile.am 2010-01-25 15:53:54 UTC (rev 4552) @@ -8,7 +8,6 @@
plugins_includedir = $(includedir)/geany plugins_include_HEADERS = \ - pluginmacros.h \ geanyplugin.h \ geanyfunctions.h
Modified: trunk/plugins/geanyfunctions.h =================================================================== --- trunk/plugins/geanyfunctions.h 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/plugins/geanyfunctions.h 2010-01-25 15:53:54 UTC (rev 4552) @@ -5,7 +5,7 @@ * * E.g.:@code * #define plugin_add_toolbar_item \ - * geany_functions->p_plugin->add_toolbar_item @endcode + * geany_functions->p_plugin->plugin_add_toolbar_item @endcode * * You need to declare the @ref geany_functions symbol yourself. * @@ -17,312 +17,312 @@ #define GEANY_FUNCTIONS_H
#define plugin_add_toolbar_item \ - geany_functions->p_plugin->add_toolbar_item + geany_functions->p_plugin->plugin_add_toolbar_item #define plugin_module_make_resident \ - geany_functions->p_plugin->module_make_resident + geany_functions->p_plugin->plugin_module_make_resident #define plugin_signal_connect \ - geany_functions->p_plugin->signal_connect + geany_functions->p_plugin->plugin_signal_connect #define plugin_set_key_group \ - geany_functions->p_plugin->set_key_group + geany_functions->p_plugin->plugin_set_key_group #define plugin_show_configure \ - geany_functions->p_plugin->show_configure + geany_functions->p_plugin->plugin_show_configure #define document_new_file \ - geany_functions->p_document->new_file + geany_functions->p_document->document_new_file #define document_get_current \ - geany_functions->p_document->get_current + geany_functions->p_document->document_get_current #define document_get_from_page \ - geany_functions->p_document->get_from_page + geany_functions->p_document->document_get_from_page #define document_find_by_filename \ - geany_functions->p_document->find_by_filename + geany_functions->p_document->document_find_by_filename #define document_find_by_real_path \ - geany_functions->p_document->find_by_real_path + geany_functions->p_document->document_find_by_real_path #define document_save_file \ - geany_functions->p_document->save_file + geany_functions->p_document->document_save_file #define document_open_file \ - geany_functions->p_document->open_file + geany_functions->p_document->document_open_file #define document_open_files \ - geany_functions->p_document->open_files + geany_functions->p_document->document_open_files #define document_remove_page \ - geany_functions->p_document->remove_page + geany_functions->p_document->document_remove_page #define document_reload_file \ - geany_functions->p_document->reload_file + geany_functions->p_document->document_reload_file #define document_set_encoding \ - geany_functions->p_document->set_encoding + geany_functions->p_document->document_set_encoding #define document_set_text_changed \ - geany_functions->p_document->set_text_changed + geany_functions->p_document->document_set_text_changed #define document_set_filetype \ - geany_functions->p_document->set_filetype + geany_functions->p_document->document_set_filetype #define document_close \ - geany_functions->p_document->close + geany_functions->p_document->document_close #define document_index \ - geany_functions->p_document->index + geany_functions->p_document->document_index #define document_save_file_as \ - geany_functions->p_document->save_file_as + geany_functions->p_document->document_save_file_as #define document_rename_file \ - geany_functions->p_document->rename_file + geany_functions->p_document->document_rename_file #define document_get_status_color \ - geany_functions->p_document->get_status_color + geany_functions->p_document->document_get_status_color #define document_get_basename_for_display \ - geany_functions->p_document->get_basename_for_display + geany_functions->p_document->document_get_basename_for_display #define document_get_notebook_page \ - geany_functions->p_document->get_notebook_page + geany_functions->p_document->document_get_notebook_page #define editor_get_indent_prefs \ - geany_functions->p_editor->get_indent_prefs + geany_functions->p_editor->editor_get_indent_prefs #define editor_create_widget \ - geany_functions->p_editor->create_widget + geany_functions->p_editor->editor_create_widget #define editor_indicator_set_on_range \ - geany_functions->p_editor->indicator_set_on_range + geany_functions->p_editor->editor_indicator_set_on_range #define editor_indicator_set_on_line \ - geany_functions->p_editor->indicator_set_on_line + geany_functions->p_editor->editor_indicator_set_on_line #define editor_indicator_clear \ - geany_functions->p_editor->indicator_clear + geany_functions->p_editor->editor_indicator_clear #define editor_set_indent_type \ - geany_functions->p_editor->set_indent_type + geany_functions->p_editor->editor_set_indent_type #define editor_get_word_at_pos \ - geany_functions->p_editor->get_word_at_pos + geany_functions->p_editor->editor_get_word_at_pos #define editor_get_eol_char_name \ - geany_functions->p_editor->get_eol_char_name + geany_functions->p_editor->editor_get_eol_char_name #define editor_get_eol_char_len \ - geany_functions->p_editor->get_eol_char_len + geany_functions->p_editor->editor_get_eol_char_len #define editor_get_eol_char \ - geany_functions->p_editor->get_eol_char + geany_functions->p_editor->editor_get_eol_char #define editor_insert_text_block \ - geany_functions->p_editor->insert_text_block + geany_functions->p_editor->editor_insert_text_block #define scintilla_send_message \ - geany_functions->p_scintilla->send_message + geany_functions->p_scintilla->scintilla_send_message #define scintilla_new \ - geany_functions->p_scintilla->new + geany_functions->p_scintilla->scintilla_new #define sci_send_command \ - geany_functions->p_sci->send_command + geany_functions->p_sci->sci_send_command #define sci_start_undo_action \ - geany_functions->p_sci->start_undo_action + geany_functions->p_sci->sci_start_undo_action #define sci_end_undo_action \ - geany_functions->p_sci->end_undo_action + geany_functions->p_sci->sci_end_undo_action #define sci_set_text \ - geany_functions->p_sci->set_text + geany_functions->p_sci->sci_set_text #define sci_insert_text \ - geany_functions->p_sci->insert_text + geany_functions->p_sci->sci_insert_text #define sci_get_text \ - geany_functions->p_sci->get_text + geany_functions->p_sci->sci_get_text #define sci_get_length \ - geany_functions->p_sci->get_length + geany_functions->p_sci->sci_get_length #define sci_get_current_position \ - geany_functions->p_sci->get_current_position + geany_functions->p_sci->sci_get_current_position #define sci_set_current_position \ - geany_functions->p_sci->set_current_position + geany_functions->p_sci->sci_set_current_position #define sci_get_col_from_position \ - geany_functions->p_sci->get_col_from_position + geany_functions->p_sci->sci_get_col_from_position #define sci_get_line_from_position \ - geany_functions->p_sci->get_line_from_position + geany_functions->p_sci->sci_get_line_from_position #define sci_get_position_from_line \ - geany_functions->p_sci->get_position_from_line + geany_functions->p_sci->sci_get_position_from_line #define sci_replace_sel \ - geany_functions->p_sci->replace_sel + geany_functions->p_sci->sci_replace_sel #define sci_get_selected_text \ - geany_functions->p_sci->get_selected_text + geany_functions->p_sci->sci_get_selected_text #define sci_get_selected_text_length \ - geany_functions->p_sci->get_selected_text_length + geany_functions->p_sci->sci_get_selected_text_length #define sci_get_selection_start \ - geany_functions->p_sci->get_selection_start + geany_functions->p_sci->sci_get_selection_start #define sci_get_selection_end \ - geany_functions->p_sci->get_selection_end + geany_functions->p_sci->sci_get_selection_end #define sci_get_selection_mode \ - geany_functions->p_sci->get_selection_mode + geany_functions->p_sci->sci_get_selection_mode #define sci_set_selection_mode \ - geany_functions->p_sci->set_selection_mode + geany_functions->p_sci->sci_set_selection_mode #define sci_set_selection_start \ - geany_functions->p_sci->set_selection_start + geany_functions->p_sci->sci_set_selection_start #define sci_set_selection_end \ - geany_functions->p_sci->set_selection_end + geany_functions->p_sci->sci_set_selection_end #define sci_get_text_range \ - geany_functions->p_sci->get_text_range + geany_functions->p_sci->sci_get_text_range #define sci_get_line \ - geany_functions->p_sci->get_line + geany_functions->p_sci->sci_get_line #define sci_get_line_length \ - geany_functions->p_sci->get_line_length + geany_functions->p_sci->sci_get_line_length #define sci_get_line_count \ - geany_functions->p_sci->get_line_count + geany_functions->p_sci->sci_get_line_count #define sci_get_line_is_visible \ - geany_functions->p_sci->get_line_is_visible + geany_functions->p_sci->sci_get_line_is_visible #define sci_ensure_line_is_visible \ - geany_functions->p_sci->ensure_line_is_visible + geany_functions->p_sci->sci_ensure_line_is_visible #define sci_scroll_caret \ - geany_functions->p_sci->scroll_caret + geany_functions->p_sci->sci_scroll_caret #define sci_find_matching_brace \ - geany_functions->p_sci->find_matching_brace + geany_functions->p_sci->sci_find_matching_brace #define sci_get_style_at \ - geany_functions->p_sci->get_style_at + geany_functions->p_sci->sci_get_style_at #define sci_get_char_at \ - geany_functions->p_sci->get_char_at + geany_functions->p_sci->sci_get_char_at #define sci_get_current_line \ - geany_functions->p_sci->get_current_line + geany_functions->p_sci->sci_get_current_line #define sci_has_selection \ - geany_functions->p_sci->has_selection + geany_functions->p_sci->sci_has_selection #define sci_get_tab_width \ - geany_functions->p_sci->get_tab_width + geany_functions->p_sci->sci_get_tab_width #define sci_indicator_clear \ - geany_functions->p_sci->indicator_clear + geany_functions->p_sci->sci_indicator_clear #define sci_indicator_set \ - geany_functions->p_sci->indicator_set + geany_functions->p_sci->sci_indicator_set #define sci_get_contents \ - geany_functions->p_sci->get_contents + geany_functions->p_sci->sci_get_contents #define sci_get_contents_range \ - geany_functions->p_sci->get_contents_range + geany_functions->p_sci->sci_get_contents_range #define sci_get_selection_contents \ - geany_functions->p_sci->get_selection_contents + geany_functions->p_sci->sci_get_selection_contents #define sci_set_font \ - geany_functions->p_sci->set_font + geany_functions->p_sci->sci_set_font #define sci_get_line_end_position \ - geany_functions->p_sci->get_line_end_position + geany_functions->p_sci->sci_get_line_end_position #define sci_set_target_start \ - geany_functions->p_sci->set_target_start + geany_functions->p_sci->sci_set_target_start #define sci_set_target_end \ - geany_functions->p_sci->set_target_end + geany_functions->p_sci->sci_set_target_end #define sci_replace_target \ - geany_functions->p_sci->replace_target + geany_functions->p_sci->sci_replace_target #define sci_set_marker_at_line \ - geany_functions->p_sci->set_marker_at_line + geany_functions->p_sci->sci_set_marker_at_line #define sci_delete_marker_at_line \ - geany_functions->p_sci->delete_marker_at_line + geany_functions->p_sci->sci_delete_marker_at_line #define sci_is_marker_set_at_line \ - geany_functions->p_sci->is_marker_set_at_line + geany_functions->p_sci->sci_is_marker_set_at_line #define sci_goto_line \ - geany_functions->p_sci->goto_line + geany_functions->p_sci->sci_goto_line #define sci_find_text \ - geany_functions->p_sci->find_text + geany_functions->p_sci->sci_find_text #define templates_get_template_fileheader \ - geany_functions->p_templates->get_template_fileheader + geany_functions->p_templates->templates_get_template_fileheader #define utils_str_equal \ - geany_functions->p_utils->str_equal + geany_functions->p_utils->utils_str_equal #define utils_string_replace_all \ - geany_functions->p_utils->string_replace_all + geany_functions->p_utils->utils_string_replace_all #define utils_get_file_list \ - geany_functions->p_utils->get_file_list + geany_functions->p_utils->utils_get_file_list #define utils_write_file \ - geany_functions->p_utils->write_file + geany_functions->p_utils->utils_write_file #define utils_get_locale_from_utf8 \ - geany_functions->p_utils->get_locale_from_utf8 + geany_functions->p_utils->utils_get_locale_from_utf8 #define utils_get_utf8_from_locale \ - geany_functions->p_utils->get_utf8_from_locale + geany_functions->p_utils->utils_get_utf8_from_locale #define utils_remove_ext_from_filename \ - geany_functions->p_utils->remove_ext_from_filename + geany_functions->p_utils->utils_remove_ext_from_filename #define utils_mkdir \ - geany_functions->p_utils->mkdir + geany_functions->p_utils->utils_mkdir #define utils_get_setting_boolean \ - geany_functions->p_utils->get_setting_boolean + geany_functions->p_utils->utils_get_setting_boolean #define utils_get_setting_integer \ - geany_functions->p_utils->get_setting_integer + geany_functions->p_utils->utils_get_setting_integer #define utils_get_setting_string \ - geany_functions->p_utils->get_setting_string + geany_functions->p_utils->utils_get_setting_string #define utils_spawn_sync \ - geany_functions->p_utils->spawn_sync + geany_functions->p_utils->utils_spawn_sync #define utils_spawn_async \ - geany_functions->p_utils->spawn_async + geany_functions->p_utils->utils_spawn_async #define utils_str_casecmp \ - geany_functions->p_utils->str_casecmp + geany_functions->p_utils->utils_str_casecmp #define utils_get_date_time \ - geany_functions->p_utils->get_date_time + geany_functions->p_utils->utils_get_date_time #define utils_open_browser \ - geany_functions->p_utils->open_browser + geany_functions->p_utils->utils_open_browser #define utils_string_replace_first \ - geany_functions->p_utils->string_replace_first + geany_functions->p_utils->utils_string_replace_first #define utils_str_middle_truncate \ - geany_functions->p_utils->str_middle_truncate + geany_functions->p_utils->utils_str_middle_truncate #define utils_str_remove_chars \ - geany_functions->p_utils->str_remove_chars + geany_functions->p_utils->utils_str_remove_chars #define utils_get_file_list_full \ - geany_functions->p_utils->get_file_list_full + geany_functions->p_utils->utils_get_file_list_full #define ui_dialog_vbox_new \ - geany_functions->p_ui->dialog_vbox_new + geany_functions->p_ui->ui_dialog_vbox_new #define ui_frame_new_with_alignment \ - geany_functions->p_ui->frame_new_with_alignment + geany_functions->p_ui->ui_frame_new_with_alignment #define ui_set_statusbar \ - geany_functions->p_ui->set_statusbar + geany_functions->p_ui->ui_set_statusbar #define ui_table_add_row \ - geany_functions->p_ui->table_add_row + geany_functions->p_ui->ui_table_add_row #define ui_path_box_new \ - geany_functions->p_ui->path_box_new + geany_functions->p_ui->ui_path_box_new #define ui_button_new_with_image \ - geany_functions->p_ui->button_new_with_image + geany_functions->p_ui->ui_button_new_with_image #define ui_add_document_sensitive \ - geany_functions->p_ui->add_document_sensitive + geany_functions->p_ui->ui_add_document_sensitive #define ui_widget_set_tooltip_text \ - geany_functions->p_ui->widget_set_tooltip_text + geany_functions->p_ui->ui_widget_set_tooltip_text #define ui_image_menu_item_new \ - geany_functions->p_ui->image_menu_item_new + geany_functions->p_ui->ui_image_menu_item_new #define ui_lookup_widget \ - geany_functions->p_ui->lookup_widget + geany_functions->p_ui->ui_lookup_widget #define ui_progress_bar_start \ - geany_functions->p_ui->progress_bar_start + geany_functions->p_ui->ui_progress_bar_start #define ui_progress_bar_stop \ - geany_functions->p_ui->progress_bar_stop + geany_functions->p_ui->ui_progress_bar_stop #define ui_entry_add_clear_icon \ - geany_functions->p_ui->entry_add_clear_icon + geany_functions->p_ui->ui_entry_add_clear_icon #define ui_menu_add_document_items \ - geany_functions->p_ui->menu_add_document_items + geany_functions->p_ui->ui_menu_add_document_items #define ui_widget_modify_font_from_string \ - geany_functions->p_ui->widget_modify_font_from_string + geany_functions->p_ui->ui_widget_modify_font_from_string #define dialogs_show_question \ - geany_functions->p_dialogs->show_question + geany_functions->p_dialogs->dialogs_show_question #define dialogs_show_msgbox \ - geany_functions->p_dialogs->show_msgbox + geany_functions->p_dialogs->dialogs_show_msgbox #define dialogs_show_save_as \ - geany_functions->p_dialogs->show_save_as + geany_functions->p_dialogs->dialogs_show_save_as #define dialogs_show_input_numeric \ - geany_functions->p_dialogs->show_input_numeric + geany_functions->p_dialogs->dialogs_show_input_numeric #define msgwin_status_add \ - geany_functions->p_msgwin->status_add + geany_functions->p_msgwin->msgwin_status_add #define msgwin_compiler_add \ - geany_functions->p_msgwin->compiler_add + geany_functions->p_msgwin->msgwin_compiler_add #define msgwin_msg_add \ - geany_functions->p_msgwin->msg_add + geany_functions->p_msgwin->msgwin_msg_add #define msgwin_clear_tab \ - geany_functions->p_msgwin->clear_tab + geany_functions->p_msgwin->msgwin_clear_tab #define msgwin_switch_tab \ - geany_functions->p_msgwin->switch_tab + geany_functions->p_msgwin->msgwin_switch_tab #define encodings_convert_to_utf8 \ - geany_functions->p_encodings->convert_to_utf8 + geany_functions->p_encodings->encodings_convert_to_utf8 #define encodings_convert_to_utf8_from_charset \ - geany_functions->p_encodings->convert_to_utf8_from_charset + geany_functions->p_encodings->encodings_convert_to_utf8_from_charset #define encodings_get_charset_from_index \ - geany_functions->p_encodings->get_charset_from_index + geany_functions->p_encodings->encodings_get_charset_from_index #define keybindings_send_command \ - geany_functions->p_keybindings->send_command + geany_functions->p_keybindings->keybindings_send_command #define keybindings_set_item \ - geany_functions->p_keybindings->set_item + geany_functions->p_keybindings->keybindings_set_item #define keybindings_get_item \ - geany_functions->p_keybindings->get_item + geany_functions->p_keybindings->keybindings_get_item #define tm_get_real_path \ - geany_functions->p_tm->get_real_path + geany_functions->p_tm->tm_get_real_path #define tm_source_file_new \ - geany_functions->p_tm->source_file_new + geany_functions->p_tm->tm_source_file_new #define tm_workspace_add_object \ - geany_functions->p_tm->workspace_add_object + geany_functions->p_tm->tm_workspace_add_object #define tm_source_file_update \ - geany_functions->p_tm->source_file_update + geany_functions->p_tm->tm_source_file_update #define tm_work_object_free \ - geany_functions->p_tm->work_object_free + geany_functions->p_tm->tm_work_object_free #define tm_workspace_remove_object \ - geany_functions->p_tm->workspace_remove_object + geany_functions->p_tm->tm_workspace_remove_object #define search_show_find_in_files_dialog \ - geany_functions->p_search->show_find_in_files_dialog + geany_functions->p_search->search_show_find_in_files_dialog #define highlighting_get_style \ - geany_functions->p_highlighting->get_style + geany_functions->p_highlighting->highlighting_get_style #define highlighting_set_styles \ - geany_functions->p_highlighting->set_styles + geany_functions->p_highlighting->highlighting_set_styles #define filetypes_detect_from_file \ - geany_functions->p_filetypes->detect_from_file + geany_functions->p_filetypes->filetypes_detect_from_file #define filetypes_lookup_by_name \ - geany_functions->p_filetypes->lookup_by_name + geany_functions->p_filetypes->filetypes_lookup_by_name #define filetypes_index \ - geany_functions->p_filetypes->index + geany_functions->p_filetypes->filetypes_index #define navqueue_goto_line \ - geany_functions->p_navqueue->goto_line + geany_functions->p_navqueue->navqueue_goto_line #define main_reload_configuration \ - geany_functions->p_main->reload_configuration + geany_functions->p_main->main_reload_configuration #define main_locale_init \ - geany_functions->p_main->locale_init + geany_functions->p_main->main_locale_init #define main_is_realized \ - geany_functions->p_main->is_realized + geany_functions->p_main->main_is_realized
#endif
Modified: trunk/plugins/genapi.py =================================================================== --- trunk/plugins/genapi.py 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/plugins/genapi.py 2010-01-25 15:53:54 UTC (rev 4552) @@ -26,7 +26,7 @@ Creates macros for each plugin API function pointer, e.g.:
#define plugin_add_toolbar_item \ - geany_functions->p_plugin->add_toolbar_item + geany_functions->p_plugin->plugin_add_toolbar_item """
@@ -63,7 +63,7 @@ * * E.g.:@code * #define plugin_add_toolbar_item \ - * geany_functions->p_plugin->add_toolbar_item @endcode + * geany_functions->p_plugin->plugin_add_toolbar_item @endcode * * You need to declare the @ref geany_functions symbol yourself. * @@ -87,7 +87,8 @@
for fname in fnames: ptr, name = get_api_tuple(fname) - print >>f, '#define %s \\n\tgeany_functions->%s->%s' % (fname, ptr, name) + # note: name no longer needed + print >>f, '#define %s \\n\tgeany_functions->%s->%s' % (fname, ptr, fname)
print >>f, '\n#endif' f.close
Deleted: trunk/plugins/pluginmacros.h =================================================================== --- trunk/plugins/pluginmacros.h 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/plugins/pluginmacros.h 2010-01-25 15:53:54 UTC (rev 4552) @@ -1,64 +0,0 @@ -/* - * pluginmacros.h - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * $Id$ - */ - -/** @file pluginmacros.h - * @deprecated Use geanyfunctions.h instead. - * Macros to avoid typing @c geany_functions-> so often. - * - * @section function_macros Function Macros - * These macros are named the same as the first word in the core function name, - * but with a 'p_' prefix to prevent conflicts with other tag names. - * - * Example for @c document_open_file(): @c p_document->open_file(); */ - - -#ifndef PLUGINMACROS_H -#define PLUGINMACROS_H - -/* common items */ -#define documents_array geany_data->documents_array /**< @deprecated Use @c geany->documents_array->len and document_index() instead. */ -#define filetypes_array geany_data->filetypes_array /**< @deprecated Use @c geany->filetypes_array->len and filetypes_index() instead. */ - - -/* function group macros */ -#define p_editor geany_functions->p_editor /**< See editor.h */ -#define p_document geany_functions->p_document /**< See document.h */ -#define p_dialogs geany_functions->p_dialogs /**< See dialogs.h */ -#define p_encodings geany_functions->p_encodings /**< See encodings.h */ -#define p_filetypes geany_functions->p_filetypes /**< See filetypes.h */ -#define p_highlighting geany_functions->p_highlighting /**< See highlighting.h */ -#define p_keybindings geany_functions->p_keybindings /**< See keybindings.h */ -#define p_main geany_functions->p_main /**< See main.h */ -#define p_msgwindow geany_functions->p_msgwindow /**< See msgwindow.h */ -#define p_navqueue geany_functions->p_navqueue /**< See navqueue.h */ -#define p_plugin geany_functions->p_plugin /**< See plugins.c */ -#define p_sci geany_functions->p_sci /**< See sciwrappers.h */ -#define p_search geany_functions->p_search /**< See search.h */ -#define p_support geany_functions->p_support /**< See support.h */ -#define p_templates geany_functions->p_templates /**< See templates.h */ -#define p_tm geany_functions->p_tm /**< See the TagManager headers. */ -#define p_ui geany_functions->p_ui /**< See ui_utils.h */ -#define p_utils geany_functions->p_utils /**< See utils.h */ - -#endif
Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/src/highlighting.c 2010-01-25 15:53:54 UTC (rev 4552) @@ -3274,7 +3274,7 @@ * @param ft_id Filetype ID, e.g. @c GEANY_FILETYPES_DIFF. * @param style_id A Scintilla lexer style, e.g. @c SCE_DIFF_ADDED. See scintilla/include/SciLexer.h. * @return A pointer to the style struct. - * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with ScintillaFuncs::send_message(). */ + * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with scintilla_send_message(). */ const GeanyLexerStyle *highlighting_get_style(gint ft_id, gint style_id) { if (ft_id < 0 || ft_id >= (gint)filetypes_array->len)
Modified: trunk/src/highlighting.h =================================================================== --- trunk/src/highlighting.h 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/src/highlighting.h 2010-01-25 15:53:54 UTC (rev 4552) @@ -30,7 +30,7 @@
/** Fields representing the different attributes of a Scintilla lexer style. - * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with ScintillaFuncs::send_message(). */ + * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with scintilla_send_message(). */ typedef struct GeanyLexerStyle { gint foreground; /**< Foreground text colour, in @c 0xBBGGRR format. */
Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/src/plugindata.h 2010-01-25 15:53:54 UTC (rev 4552) @@ -50,7 +50,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 170, + GEANY_API_VERSION = 171,
/** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -249,29 +249,29 @@ /* See document.h */ typedef struct DocumentFuncs { - struct GeanyDocument* (*new_file) (const gchar *utf8_filename, struct GeanyFiletype *ft, + struct GeanyDocument* (*document_new_file) (const gchar *utf8_filename, struct GeanyFiletype *ft, const gchar *text); - struct GeanyDocument* (*get_current) (void); - struct GeanyDocument* (*get_from_page) (guint page_num); - struct GeanyDocument* (*find_by_filename) (const gchar *utf8_filename); - struct GeanyDocument* (*find_by_real_path) (const gchar *realname); - gboolean (*save_file) (struct GeanyDocument *doc, gboolean force); - struct GeanyDocument* (*open_file) (const gchar *locale_filename, gboolean readonly, + struct GeanyDocument* (*document_get_current) (void); + struct GeanyDocument* (*document_get_from_page) (guint page_num); + struct GeanyDocument* (*document_find_by_filename) (const gchar *utf8_filename); + struct GeanyDocument* (*document_find_by_real_path) (const gchar *realname); + gboolean (*document_save_file) (struct GeanyDocument *doc, gboolean force); + struct GeanyDocument* (*document_open_file) (const gchar *locale_filename, gboolean readonly, struct GeanyFiletype *ft, const gchar *forced_enc); - void (*open_files) (const GSList *filenames, gboolean readonly, + void (*document_open_files) (const GSList *filenames, gboolean readonly, struct GeanyFiletype *ft, const gchar *forced_enc); - gboolean (*remove_page) (guint page_num); - gboolean (*reload_file) (struct GeanyDocument *doc, const gchar *forced_enc); - void (*set_encoding) (struct GeanyDocument *doc, const gchar *new_encoding); - void (*set_text_changed) (struct GeanyDocument *doc, gboolean changed); - void (*set_filetype) (struct GeanyDocument *doc, struct GeanyFiletype *type); - gboolean (*close) (struct GeanyDocument *doc); - struct GeanyDocument* (*index)(gint idx); - gboolean (*save_file_as) (struct GeanyDocument *doc, const gchar *utf8_fname); - void (*rename_file) (struct GeanyDocument *doc, const gchar *new_filename); - const GdkColor* (*get_status_color) (struct GeanyDocument *doc); - gchar* (*get_basename_for_display) (struct GeanyDocument *doc, gint length); - gint (*get_notebook_page) (struct GeanyDocument *doc); + gboolean (*document_remove_page) (guint page_num); + gboolean (*document_reload_file) (struct GeanyDocument *doc, const gchar *forced_enc); + void (*document_set_encoding) (struct GeanyDocument *doc, const gchar *new_encoding); + void (*document_set_text_changed) (struct GeanyDocument *doc, gboolean changed); + void (*document_set_filetype) (struct GeanyDocument *doc, struct GeanyFiletype *type); + gboolean (*document_close) (struct GeanyDocument *doc); + struct GeanyDocument* (*document_index)(gint idx); + gboolean (*document_save_file_as) (struct GeanyDocument *doc, const gchar *utf8_fname); + void (*document_rename_file) (struct GeanyDocument *doc, const gchar *new_filename); + const GdkColor* (*document_get_status_color) (struct GeanyDocument *doc); + gchar* (*document_get_basename_for_display) (struct GeanyDocument *doc, gint length); + gint (*document_get_notebook_page) (struct GeanyDocument *doc); } DocumentFuncs;
@@ -282,10 +282,10 @@ typedef struct ScintillaFuncs { /** Send Scintilla a message. */ - long int (*send_message) (struct _ScintillaObject* sci, unsigned int iMessage, + long int (*scintilla_send_message) (struct _ScintillaObject* sci, unsigned int iMessage, long unsigned int wParam, long int lParam); /** Create a new ScintillaObject widget. */ - GtkWidget* (*new)(void); + GtkWidget* (*scintilla_new)(void); } ScintillaFuncs;
@@ -294,60 +294,60 @@ * See sciwrappers.h for the list of functions. */ typedef struct SciFuncs { - /** @deprecated Use @ref ScintillaFuncs::send_message() instead. */ + /** @deprecated Use @c scintilla_send_message() instead. */ long int (*send_message) (struct _ScintillaObject *sci, unsigned int iMessage, long unsigned int wParam, long int lParam); void (*send_command) (struct _ScintillaObject *sci, gint cmd);
- void (*start_undo_action) (struct _ScintillaObject *sci); - void (*end_undo_action) (struct _ScintillaObject *sci); - void (*set_text) (struct _ScintillaObject *sci, const gchar *text); - void (*insert_text) (struct _ScintillaObject *sci, gint pos, const gchar *text); - void (*get_text) (struct _ScintillaObject *sci, gint len, gchar *text); - gint (*get_length) (struct _ScintillaObject *sci); - gint (*get_current_position) (struct _ScintillaObject *sci); - void (*set_current_position) (struct _ScintillaObject *sci, gint position, + void (*sci_start_undo_action) (struct _ScintillaObject *sci); + void (*sci_end_undo_action) (struct _ScintillaObject *sci); + void (*sci_set_text) (struct _ScintillaObject *sci, const gchar *text); + void (*sci_insert_text) (struct _ScintillaObject *sci, gint pos, const gchar *text); + void (*sci_get_text) (struct _ScintillaObject *sci, gint len, gchar *text); + gint (*sci_get_length) (struct _ScintillaObject *sci); + gint (*sci_get_current_position) (struct _ScintillaObject *sci); + void (*sci_set_current_position) (struct _ScintillaObject *sci, gint position, gboolean scroll_to_caret); - gint (*get_col_from_position) (struct _ScintillaObject *sci, gint position); - gint (*get_line_from_position) (struct _ScintillaObject *sci, gint position); - gint (*get_position_from_line) (struct _ScintillaObject *sci, gint line); - void (*replace_sel) (struct _ScintillaObject *sci, const gchar *text); - void (*get_selected_text) (struct _ScintillaObject *sci, gchar *text); - gint (*get_selected_text_length) (struct _ScintillaObject *sci); - gint (*get_selection_start) (struct _ScintillaObject *sci); - gint (*get_selection_end) (struct _ScintillaObject *sci); - gint (*get_selection_mode) (struct _ScintillaObject *sci); - void (*set_selection_mode) (struct _ScintillaObject *sci, gint mode); - void (*set_selection_start) (struct _ScintillaObject *sci, gint position); - void (*set_selection_end) (struct _ScintillaObject *sci, gint position); - void (*get_text_range) (struct _ScintillaObject *sci, gint start, gint end, gchar *text); - gchar* (*get_line) (struct _ScintillaObject *sci, gint line_num); - gint (*get_line_length) (struct _ScintillaObject *sci, gint line); - gint (*get_line_count) (struct _ScintillaObject *sci); - gboolean (*get_line_is_visible) (struct _ScintillaObject *sci, gint line); - void (*ensure_line_is_visible) (struct _ScintillaObject *sci, gint line); - void (*scroll_caret) (struct _ScintillaObject *sci); - gint (*find_matching_brace) (struct _ScintillaObject *sci, gint pos); - gint (*get_style_at) (struct _ScintillaObject *sci, gint position); - gchar (*get_char_at) (struct _ScintillaObject *sci, gint pos); - gint (*get_current_line) (struct _ScintillaObject *sci); - gboolean (*has_selection) (struct _ScintillaObject *sci); - gint (*get_tab_width) (struct _ScintillaObject *sci); - void (*indicator_clear) (struct _ScintillaObject *sci, gint start, gint end); - void (*indicator_set) (struct _ScintillaObject *sci, gint indic); - gchar* (*get_contents) (struct _ScintillaObject *sci, gint len); - gchar* (*get_contents_range) (struct _ScintillaObject *sci, gint start, gint end); - gchar* (*get_selection_contents) (struct _ScintillaObject *sci); - void (*set_font) (struct _ScintillaObject *sci, gint style, const gchar *font, gint size); - gint (*get_line_end_position) (struct _ScintillaObject *sci, gint line); - void (*set_target_start) (struct _ScintillaObject *sci, gint start); - void (*set_target_end) (struct _ScintillaObject *sci, gint end); - gint (*replace_target) (struct _ScintillaObject *sci, const gchar *text, gboolean regex); - void (*set_marker_at_line) (struct _ScintillaObject *sci, gint line_number, gint marker); - void (*delete_marker_at_line) (struct _ScintillaObject *sci, gint line_number, gint marker); - gboolean (*is_marker_set_at_line) (struct _ScintillaObject *sci, gint line, gint marker); - void (*goto_line) (struct _ScintillaObject *sci, gint line, gboolean unfold); - gint (*find_text) (struct _ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf); + gint (*sci_get_col_from_position) (struct _ScintillaObject *sci, gint position); + gint (*sci_get_line_from_position) (struct _ScintillaObject *sci, gint position); + gint (*sci_get_position_from_line) (struct _ScintillaObject *sci, gint line); + void (*sci_replace_sel) (struct _ScintillaObject *sci, const gchar *text); + void (*sci_get_selected_text) (struct _ScintillaObject *sci, gchar *text); + gint (*sci_get_selected_text_length) (struct _ScintillaObject *sci); + gint (*sci_get_selection_start) (struct _ScintillaObject *sci); + gint (*sci_get_selection_end) (struct _ScintillaObject *sci); + gint (*sci_get_selection_mode) (struct _ScintillaObject *sci); + void (*sci_set_selection_mode) (struct _ScintillaObject *sci, gint mode); + void (*sci_set_selection_start) (struct _ScintillaObject *sci, gint position); + void (*sci_set_selection_end) (struct _ScintillaObject *sci, gint position); + void (*sci_get_text_range) (struct _ScintillaObject *sci, gint start, gint end, gchar *text); + gchar* (*sci_get_line) (struct _ScintillaObject *sci, gint line_num); + gint (*sci_get_line_length) (struct _ScintillaObject *sci, gint line); + gint (*sci_get_line_count) (struct _ScintillaObject *sci); + gboolean (*sci_get_line_is_visible) (struct _ScintillaObject *sci, gint line); + void (*sci_ensure_line_is_visible) (struct _ScintillaObject *sci, gint line); + void (*sci_scroll_caret) (struct _ScintillaObject *sci); + gint (*sci_find_matching_brace) (struct _ScintillaObject *sci, gint pos); + gint (*sci_get_style_at) (struct _ScintillaObject *sci, gint position); + gchar (*sci_get_char_at) (struct _ScintillaObject *sci, gint pos); + gint (*sci_get_current_line) (struct _ScintillaObject *sci); + gboolean (*sci_has_selection) (struct _ScintillaObject *sci); + gint (*sci_get_tab_width) (struct _ScintillaObject *sci); + void (*sci_indicator_clear) (struct _ScintillaObject *sci, gint start, gint end); + void (*sci_indicator_set) (struct _ScintillaObject *sci, gint indic); + gchar* (*sci_get_contents) (struct _ScintillaObject *sci, gint len); + gchar* (*sci_get_contents_range) (struct _ScintillaObject *sci, gint start, gint end); + gchar* (*sci_get_selection_contents) (struct _ScintillaObject *sci); + void (*sci_set_font) (struct _ScintillaObject *sci, gint style, const gchar *font, gint size); + gint (*sci_get_line_end_position) (struct _ScintillaObject *sci, gint line); + void (*sci_set_target_start) (struct _ScintillaObject *sci, gint start); + void (*sci_set_target_end) (struct _ScintillaObject *sci, gint end); + gint (*sci_replace_target) (struct _ScintillaObject *sci, const gchar *text, gboolean regex); + void (*sci_set_marker_at_line) (struct _ScintillaObject *sci, gint line_number, gint marker); + void (*sci_delete_marker_at_line) (struct _ScintillaObject *sci, gint line_number, gint marker); + gboolean (*sci_is_marker_set_at_line) (struct _ScintillaObject *sci, gint line, gint marker); + void (*sci_goto_line) (struct _ScintillaObject *sci, gint line, gboolean unfold); + gint (*sci_find_text) (struct _ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf); } SciFuncs;
@@ -355,7 +355,7 @@ /* See templates.h */ typedef struct TemplateFuncs { - gchar* (*get_template_fileheader) (gint filetype_idx, const gchar *fname); + gchar* (*templates_get_template_fileheader) (gint filetype_idx, const gchar *fname); } TemplateFuncs;
@@ -363,35 +363,35 @@ /* See utils.h */ typedef struct UtilsFuncs { - gboolean (*str_equal) (const gchar *a, const gchar *b); - guint (*string_replace_all) (GString *haystack, const gchar *needle, + gboolean (*utils_str_equal) (const gchar *a, const gchar *b); + guint (*utils_string_replace_all) (GString *haystack, const gchar *needle, const gchar *replacement); - GSList* (*get_file_list) (const gchar *path, guint *length, GError **error); - gint (*write_file) (const gchar *filename, const gchar *text); - gchar* (*get_locale_from_utf8) (const gchar *utf8_text); - gchar* (*get_utf8_from_locale) (const gchar *locale_text); - gchar* (*remove_ext_from_filename) (const gchar *filename); - gint (*mkdir) (const gchar *path, gboolean create_parent_dirs); - gboolean (*get_setting_boolean) (GKeyFile *config, const gchar *section, const gchar *key, + GSList* (*utils_get_file_list) (const gchar *path, guint *length, GError **error); + gint (*utils_write_file) (const gchar *filename, const gchar *text); + gchar* (*utils_get_locale_from_utf8) (const gchar *utf8_text); + gchar* (*utils_get_utf8_from_locale) (const gchar *locale_text); + gchar* (*utils_remove_ext_from_filename) (const gchar *filename); + gint (*utils_mkdir) (const gchar *path, gboolean create_parent_dirs); + gboolean (*utils_get_setting_boolean) (GKeyFile *config, const gchar *section, const gchar *key, const gboolean default_value); - gint (*get_setting_integer) (GKeyFile *config, const gchar *section, const gchar *key, + gint (*utils_get_setting_integer) (GKeyFile *config, const gchar *section, const gchar *key, const gint default_value); - gchar* (*get_setting_string) (GKeyFile *config, const gchar *section, const gchar *key, + gchar* (*utils_get_setting_string) (GKeyFile *config, const gchar *section, const gchar *key, const gchar *default_value); - gboolean (*spawn_sync) (const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, + gboolean (*utils_spawn_sync) (const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, GSpawnChildSetupFunc child_setup, gpointer user_data, gchar **std_out, gchar **std_err, gint *exit_status, GError **error); - gboolean (*spawn_async) (const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, + gboolean (*utils_spawn_async) (const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error); - gint (*str_casecmp) (const gchar *s1, const gchar *s2); - gchar* (*get_date_time) (const gchar *format, time_t *time_to_use); - void (*open_browser) (const gchar *uri); - guint (*string_replace_first) (GString *haystack, const gchar *needle, + gint (*utils_str_casecmp) (const gchar *s1, const gchar *s2); + gchar* (*utils_get_date_time) (const gchar *format, time_t *time_to_use); + void (*utils_open_browser) (const gchar *uri); + guint (*utils_string_replace_first) (GString *haystack, const gchar *needle, const gchar *replace); - gchar* (*str_middle_truncate) (const gchar *string, guint truncate_length); - gchar* (*str_remove_chars) (gchar *string, const gchar *chars); - GSList* (*get_file_list_full)(const gchar *path, gboolean full_path, gboolean sort, + gchar* (*utils_str_middle_truncate) (const gchar *string, guint truncate_length); + gchar* (*utils_str_remove_chars) (gchar *string, const gchar *chars); + GSList* (*utils_get_file_list_full)(const gchar *path, gboolean full_path, gboolean sort, GError **error); } UtilsFuncs; @@ -400,9 +400,9 @@ /* See main.h */ typedef struct MainFuncs { - void (*reload_configuration) (void); - void (*locale_init) (const gchar *locale_dir, const gchar *package); - gboolean (*is_realized) (void); + void (*main_reload_configuration) (void); + void (*main_locale_init) (const gchar *locale_dir, const gchar *package); + gboolean (*main_is_realized) (void); } MainFuncs;
@@ -410,22 +410,22 @@ /* See ui_utils.h */ typedef struct UIUtilsFuncs { - GtkWidget* (*dialog_vbox_new) (GtkDialog *dialog); - GtkWidget* (*frame_new_with_alignment) (const gchar *label_text, GtkWidget **alignment); - void (*set_statusbar) (gboolean log, const gchar *format, ...) G_GNUC_PRINTF (2, 3); - void (*table_add_row) (GtkTable *table, gint row, ...) G_GNUC_NULL_TERMINATED; - GtkWidget* (*path_box_new) (const gchar *title, GtkFileChooserAction action, GtkEntry *entry); - GtkWidget* (*button_new_with_image) (const gchar *stock_id, const gchar *text); - void (*add_document_sensitive) (GtkWidget *widget); - void (*widget_set_tooltip_text) (GtkWidget *widget, const gchar *text); - GtkWidget* (*image_menu_item_new) (const gchar *stock_id, const gchar *label); - GtkWidget* (*lookup_widget) (GtkWidget *widget, const gchar *widget_name); - void (*progress_bar_start) (const gchar *text); - void (*progress_bar_stop) (void); - void (*entry_add_clear_icon) (GtkEntry *entry); - void (*menu_add_document_items) (GtkMenu *menu, struct GeanyDocument *active, + GtkWidget* (*ui_dialog_vbox_new) (GtkDialog *dialog); + GtkWidget* (*ui_frame_new_with_alignment) (const gchar *label_text, GtkWidget **alignment); + void (*ui_set_statusbar) (gboolean log, const gchar *format, ...) G_GNUC_PRINTF (2, 3); + void (*ui_table_add_row) (GtkTable *table, gint row, ...) G_GNUC_NULL_TERMINATED; + GtkWidget* (*ui_path_box_new) (const gchar *title, GtkFileChooserAction action, GtkEntry *entry); + GtkWidget* (*ui_button_new_with_image) (const gchar *stock_id, const gchar *text); + void (*ui_add_document_sensitive) (GtkWidget *widget); + void (*ui_widget_set_tooltip_text) (GtkWidget *widget, const gchar *text); + GtkWidget* (*ui_image_menu_item_new) (const gchar *stock_id, const gchar *label); + GtkWidget* (*ui_lookup_widget) (GtkWidget *widget, const gchar *widget_name); + void (*ui_progress_bar_start) (const gchar *text); + void (*ui_progress_bar_stop) (void); + void (*ui_entry_add_clear_icon) (GtkEntry *entry); + void (*ui_menu_add_document_items) (GtkMenu *menu, struct GeanyDocument *active, GCallback callback); - void (*widget_modify_font_from_string) (GtkWidget *widget, const gchar *str); + void (*ui_widget_modify_font_from_string) (GtkWidget *widget, const gchar *str); } UIUtilsFuncs;
@@ -433,12 +433,11 @@ /* See dialogs.h */ typedef struct DialogFuncs { - gboolean (*show_question) (const gchar *text, ...) G_GNUC_PRINTF (1, 2); - void (*show_msgbox) (GtkMessageType type, const gchar *text, ...) G_GNUC_PRINTF (2, 3); - gboolean (*show_save_as) (void); - gboolean (*show_input_numeric) (const gchar *title, const gchar *label_text, + gboolean (*dialogs_show_question) (const gchar *text, ...) G_GNUC_PRINTF (1, 2); + void (*dialogs_show_msgbox) (GtkMessageType type, const gchar *text, ...) G_GNUC_PRINTF (2, 3); + gboolean (*dialogs_show_save_as) (void); + gboolean (*dialogs_show_input_numeric) (const gchar *title, const gchar *label_text, gdouble *value, gdouble min, gdouble max, gdouble step); - } DialogFuncs;
@@ -446,7 +445,7 @@ /* @deprecated Use ui_lookup_widget() instead. */ typedef struct SupportFuncs { - GtkWidget* (*lookup_widget) (GtkWidget *widget, const gchar *widget_name); + GtkWidget* (*support_lookup_widget) (GtkWidget *widget, const gchar *widget_name); } SupportFuncs;
@@ -455,12 +454,12 @@ typedef struct MsgWinFuncs { /* status_add() does not set the status bar - use ui->set_statusbar() instead. */ - void (*status_add) (const gchar *format, ...) G_GNUC_PRINTF (1, 2); - void (*compiler_add) (gint msg_color, const gchar *format, ...) G_GNUC_PRINTF (2, 3); - void (*msg_add) (gint msg_color, gint line, struct GeanyDocument *doc, + void (*msgwin_status_add) (const gchar *format, ...) G_GNUC_PRINTF (1, 2); + void (*msgwin_compiler_add) (gint msg_color, const gchar *format, ...) G_GNUC_PRINTF (2, 3); + void (*msgwin_msg_add) (gint msg_color, gint line, struct GeanyDocument *doc, const gchar *format, ...) G_GNUC_PRINTF (4, 5); - void (*clear_tab) (gint tabnum); - void (*switch_tab) (gint tabnum, gboolean show); + void (*msgwin_clear_tab) (gint tabnum); + void (*msgwin_switch_tab) (gint tabnum, gboolean show); } MsgWinFuncs;
@@ -468,10 +467,10 @@ /* See encodings.h */ typedef struct EncodingFuncs { - gchar* (*convert_to_utf8) (const gchar *buffer, gsize size, gchar **used_encoding); - gchar* (*convert_to_utf8_from_charset) (const gchar *buffer, gsize size, + gchar* (*encodings_convert_to_utf8) (const gchar *buffer, gsize size, gchar **used_encoding); + gchar* (*encodings_convert_to_utf8_from_charset) (const gchar *buffer, gsize size, const gchar *charset, gboolean fast); - const gchar* (*get_charset_from_index) (gint idx); + const gchar* (*encodings_get_charset_from_index) (gint idx); } EncodingFuncs;
@@ -483,11 +482,11 @@ /* See keybindings.h */ typedef struct KeybindingFuncs { - void (*send_command) (guint group_id, guint key_id); - struct GeanyKeyBinding* (*set_item) (struct GeanyKeyGroup *group, gsize key_id, + void (*keybindings_send_command) (guint group_id, guint key_id); + struct GeanyKeyBinding* (*keybindings_set_item) (struct GeanyKeyGroup *group, gsize key_id, _GeanyKeyCallback callback, guint key, GdkModifierType mod, gchar *name, gchar *label, GtkWidget *menu_item); - struct GeanyKeyBinding* (*get_item)(struct GeanyKeyGroup *group, gsize key_id); + struct GeanyKeyBinding* (*keybindings_get_item)(struct GeanyKeyGroup *group, gsize key_id);
} KeybindingFuncs; @@ -496,8 +495,8 @@ /* See highlighting.h */ typedef struct HighlightingFuncs { - const struct GeanyLexerStyle* (*get_style) (gint ft_id, gint style_id); - void (*set_styles) (struct _ScintillaObject *sci, struct GeanyFiletype *ft); + const struct GeanyLexerStyle* (*highlighting_get_style) (gint ft_id, gint style_id); + void (*highlighting_set_styles) (struct _ScintillaObject *sci, struct GeanyFiletype *ft); } HighlightingFuncs;
@@ -505,9 +504,9 @@ /* See filetypes.h */ typedef struct FiletypeFuncs { - GeanyFiletype* (*detect_from_file) (const gchar *utf8_filename); - GeanyFiletype* (*lookup_by_name) (const gchar *name); - GeanyFiletype* (*index)(gint idx); + GeanyFiletype* (*filetypes_detect_from_file) (const gchar *utf8_filename); + GeanyFiletype* (*filetypes_lookup_by_name) (const gchar *name); + GeanyFiletype* (*filetypes_index)(gint idx); /* Remember to convert any filetype_id arguments to GeanyFiletype pointers in any * appended functions */ } @@ -517,7 +516,7 @@ /* See search.h */ typedef struct SearchFuncs { - void (*show_find_in_files_dialog) (const gchar *dir); + void (*search_show_find_in_files_dialog) (const gchar *dir); } SearchFuncs;
@@ -525,13 +524,13 @@ /* See tagmanager/include */ typedef struct TagManagerFuncs { - gchar* (*get_real_path) (const gchar *file_name); - TMWorkObject* (*source_file_new) (const char *file_name, gboolean update, const char *name); - gboolean (*workspace_add_object) (TMWorkObject *work_object); - gboolean (*source_file_update) (TMWorkObject *source_file, gboolean force, + gchar* (*tm_get_real_path) (const gchar *file_name); + TMWorkObject* (*tm_source_file_new) (const char *file_name, gboolean update, const char *name); + gboolean (*tm_workspace_add_object) (TMWorkObject *work_object); + gboolean (*tm_source_file_update) (TMWorkObject *source_file, gboolean force, gboolean recurse, gboolean update_parent); - void (*work_object_free) (gpointer work_object); - gboolean (*workspace_remove_object) (TMWorkObject *w, gboolean do_free, gboolean update); + void (*tm_work_object_free) (gpointer work_object); + gboolean (*tm_workspace_remove_object) (TMWorkObject *w, gboolean do_free, gboolean update); } TagManagerFuncs;
@@ -539,7 +538,7 @@ /* See navqueue.h */ typedef struct NavQueueFuncs { - gboolean (*goto_line) (struct GeanyDocument *old_doc, struct GeanyDocument *new_doc, + gboolean (*navqueue_goto_line) (struct GeanyDocument *old_doc, struct GeanyDocument *new_doc, gint line); } NavQueueFuncs; @@ -550,21 +549,21 @@ /* See editor.h */ typedef struct EditorFuncs { - const struct GeanyIndentPrefs* (*get_indent_prefs)(struct GeanyEditor *editor); - struct _ScintillaObject* (*create_widget)(struct GeanyEditor *editor); + const struct GeanyIndentPrefs* (*editor_get_indent_prefs)(struct GeanyEditor *editor); + struct _ScintillaObject* (*editor_create_widget)(struct GeanyEditor *editor);
- void (*indicator_set_on_range) (struct GeanyEditor *editor, gint indic, gint start, gint end); - void (*indicator_set_on_line) (struct GeanyEditor *editor, gint indic, gint line); - void (*indicator_clear) (struct GeanyEditor *editor, gint indic); + void (*editor_indicator_set_on_range) (struct GeanyEditor *editor, gint indic, gint start, gint end); + void (*editor_indicator_set_on_line) (struct GeanyEditor *editor, gint indic, gint line); + void (*editor_indicator_clear) (struct GeanyEditor *editor, gint indic);
- void (*set_indent_type)(struct GeanyEditor *editor, GeanyIndentType type); - gchar* (*get_word_at_pos) (struct GeanyEditor *editor, gint pos, const gchar *wordchars); + void (*editor_set_indent_type)(struct GeanyEditor *editor, GeanyIndentType type); + gchar* (*editor_get_word_at_pos) (struct GeanyEditor *editor, gint pos, const gchar *wordchars);
- const gchar* (*get_eol_char_name) (struct GeanyEditor *editor); - gint (*get_eol_char_len) (struct GeanyEditor *editor); - const gchar* (*get_eol_char) (struct GeanyEditor *editor); + const gchar* (*editor_get_eol_char_name) (struct GeanyEditor *editor); + gint (*editor_get_eol_char_len) (struct GeanyEditor *editor); + const gchar* (*editor_get_eol_char) (struct GeanyEditor *editor);
- void (*insert_text_block) (struct GeanyEditor *editor, const gchar *text, + void (*editor_insert_text_block) (struct GeanyEditor *editor, const gchar *text, gint insert_pos, gint cursor_index, gint newline_indent_size, gboolean replace_newlines); } @@ -577,14 +576,14 @@ /* See pluginutils.c */ typedef struct PluginFuncs { - void (*add_toolbar_item)(GeanyPlugin *plugin, GtkToolItem *item); - void (*module_make_resident) (GeanyPlugin *plugin); - void (*signal_connect) (GeanyPlugin *plugin, + void (*plugin_add_toolbar_item)(GeanyPlugin *plugin, GtkToolItem *item); + void (*plugin_module_make_resident) (GeanyPlugin *plugin); + void (*plugin_signal_connect) (GeanyPlugin *plugin, GObject *object, gchar *signal_name, gboolean after, GCallback callback, gpointer user_data); - struct GeanyKeyGroup* (*set_key_group)(GeanyPlugin *plugin, + struct GeanyKeyGroup* (*plugin_set_key_group)(GeanyPlugin *plugin, const gchar *section_name, gsize count, _GeanyKeyGroupCallback callback); - void (*show_configure)(GeanyPlugin *plugin); + void (*plugin_show_configure)(GeanyPlugin *plugin); } PluginFuncs;
Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/src/sciwrappers.c 2010-01-25 15:53:54 UTC (rev 4552) @@ -26,7 +26,7 @@ * You should also check the http://scintilla.org documentation, as it is more detailed. * @note These functions were originally from the cssed project * (http://cssed.sf.net, thanks). - * @see ScintillaFuncs::send_message(). + * @see scintilla_send_message(). */
#include <string.h>
Modified: trunk/wscript =================================================================== --- trunk/wscript 2010-01-25 15:45:27 UTC (rev 4551) +++ trunk/wscript 2010-01-25 15:53:54 UTC (rev 4552) @@ -475,7 +475,7 @@ src/document.h src/editor.h src/encodings.h src/filetypes.h src/geany.h src/highlighting.h src/keybindings.h src/msgwindow.h src/plugindata.h src/prefs.h src/project.h src/search.h src/support.h - src/templates.h src/toolbar.h src/ui_utils.h src/utils.h plugins/pluginmacros.h + src/templates.h src/toolbar.h src/ui_utils.h src/utils.h plugins/geanyplugin.h plugins/geanyfunctions.h''') bld.install_files('${PREFIX}/include/geany/scintilla', ''' scintilla/include/SciLexer.h scintilla/include/Scintilla.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.