Revision: 2406 http://geany.svn.sourceforge.net/geany/?rev=2406&view=rev Author: ntrel Date: 2008-03-26 06:27:31 -0700 (Wed, 26 Mar 2008)

Log Message: ----------- Rename p_filetype p_filetypes to keep the symmetry with filetypes_*, and define it also when GEANY_DISABLE_DEPRECATED is not set.

Modified Paths: -------------- trunk/plugins/pluginmacros.h

Modified: trunk/plugins/pluginmacros.h =================================================================== --- trunk/plugins/pluginmacros.h 2008-03-24 18:45:33 UTC (rev 2405) +++ trunk/plugins/pluginmacros.h 2008-03-26 13:27:31 UTC (rev 2406) @@ -32,15 +32,17 @@ #define prefs geany_data->prefs #define project app->project

-#ifdef GEANY_DISABLE_DEPRECATED

/* 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: document_open_file() -> p_document->open_file() */ +#define p_filetypes geany_data->filetype + +#ifdef GEANY_DISABLE_DEPRECATED + #define p_dialogs geany_data->dialogs #define p_document geany_data->documents #define p_encoding geany_data->encoding -#define p_filetype geany_data->filetype #define p_highlighting geany_data->highlighting #define p_keybindings geany_data->keybindings #define p_msgwindow geany_data->msgwindow @@ -68,6 +70,7 @@ #define p_ui ui #define p_utils utils

+ /* Temporary source compatibility macros - do not use these in new code. */ #define dialogs geany_data->dialogs #define documents geany_data->documents /* avoids conflict with document typedef */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.