enchant++.h   enchant++.h 
skipping to change at line 116 skipping to change at line 116
enchant_dict_free_string_list (m_dic t, suggs); enchant_dict_free_string_list (m_dic t, suggs);
} }
} }
std::vector<std::string> suggest (const std::string & utf8word) { std::vector<std::string> suggest (const std::string & utf8word) {
std::vector<std::string> result; std::vector<std::string> result;
suggest (utf8word, result); suggest (utf8word, result);
return result; return result;
} }
void add_to_pwl (const std::string & utf8word) { void add (const std::string & utf8word) {
enchant_dict_add_to_pwl (m_dict, utf8word.c_ enchant_dict_add (m_dict, utf8word.c_str(),
str(),
utf8word.size()); utf8word.size());
} }
void add_to_session (const std::string & utf8word) { void add_to_session (const std::string & utf8word) {
enchant_dict_add_to_session (m_dict, utf8wor d.c_str(), enchant_dict_add_to_session (m_dict, utf8wor d.c_str(),
utf8word.size() ); utf8word.size() );
} }
void is_added (const std::string & utf8word) {
enchant_dict_is_added (m_dict, utf8word.c_st
r(),
utf8word.size()
);
}
void remove (const std::string & utf8word) {
enchant_dict_remove (m_dict, utf8word.c_str(
),
utf8word.size());
}
void remove_from_session (const std::string & utf8wo
rd) {
enchant_dict_remove_from_session (m_dict, ut
f8word.c_str(),
utf8word.size()
);
}
void is_removed (const std::string & utf8word) {
enchant_dict_is_removed (m_dict, utf8word.c_
str(),
utf8word.size()
);
}
void store_replacement (const std::string & utf8bad, void store_replacement (const std::string & utf8bad,
const std::string & utf8good ) { const std::string & utf8good ) {
enchant_dict_store_replacement (m_dict, enchant_dict_store_replacement (m_dict,
utf8bad.c_st r(), utf8bad.size(), utf8bad.c_st r(), utf8bad.size(),
utf8good.c_s tr(), utf8good.size()); utf8good.c_s tr(), utf8good.size());
} }
const std::string & get_lang () const { const std::string & get_lang () const {
return m_lang; return m_lang;
} }
skipping to change at line 151 skipping to change at line 171
const std::string & get_provider_desc () const { const std::string & get_provider_desc () const {
return m_provider_desc; return m_provider_desc;
} }
const std::string & get_provider_file () const { const std::string & get_provider_file () const {
return m_provider_file; return m_provider_file;
} }
/* deprecated */ /* deprecated */
void add_to_personal (const std::string & utf8word) { void add_to_personal (const std::string & utf8word) {
return add_to_pwl (utf8word); return add (utf8word);
} }
/* deprecated */
void add_to_pwl (const std::string & utf8word) {
return add (utf8word);
}
private: private:
// space reserved for API/ABI expansion // space reserved for API/ABI expansion
void * _private[5]; void * _private[5];
static void s_describe_fn (const char * const lang, static void s_describe_fn (const char * const lang,
const char * const provid er_name, const char * const provid er_name,
const char * const provid er_desc, const char * const provid er_desc,
const char * const provid er_file, const char * const provid er_file,
void * user_data) { void * user_data) {
 End of changes. 4 change blocks. 
4 lines changed or deleted 35 lines changed or added


 enchant-provider.h   enchant-provider.h 
skipping to change at line 35 skipping to change at line 35
* respects for all of the code used other than said providers. If you mod ify * respects for all of the code used other than said providers. If you mod ify
* this file, you may extend this exception to your version of the * this file, you may extend this exception to your version of the
* file, but you are not obligated to do so. If you do not wish to * file, but you are not obligated to do so. If you do not wish to
* do so, delete this exception statement from your version. * do so, delete this exception statement from your version.
*/ */
#ifndef ENCHANT_PROVIDER_H #ifndef ENCHANT_PROVIDER_H
#define ENCHANT_PROVIDER_H #define ENCHANT_PROVIDER_H
#include <enchant.h> #include <enchant.h>
#include <glib.h>
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* private */ /* private */
ENCHANT_MODULE_EXPORT(char *) ENCHANT_MODULE_EXPORT(char *)
enchant_get_user_language(void); enchant_get_user_language(void);
#ifdef _WIN32 #ifdef _WIN32
#define ENCHANT_PLUGIN_DECLARE(name) static HANDLE s_hModule = (HANDLE)(NUL L); BOOL APIENTRY DllMain( HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) { s_hModule = hModule; return TRUE; } #define ENCHANT_PLUGIN_DECLARE(name) static HANDLE s_hModule = (HANDLE)(NUL L); BOOL APIENTRY DllMain( HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) { s_hModule = hModule; return TRUE; }
#else #else
#define ENCHANT_PLUGIN_DECLARE(name) #define ENCHANT_PLUGIN_DECLARE(name)
#endif #endif
typedef struct str_enchant_provider EnchantProvider; typedef struct str_enchant_provider EnchantProvider;
ENCHANT_MODULE_EXPORT (char *) ENCHANT_MODULE_EXPORT (GSList *)
enchant_get_user_home_dir (void); enchant_get_user_config_dirs (void);
ENCHANT_MODULE_EXPORT (char *) ENCHANT_MODULE_EXPORT (char *)
enchant_get_registry_value (const char * const prefix, const char * const key); enchant_get_registry_value (const char * const prefix, const char * const key);
ENCHANT_MODULE_EXPORT(char *) ENCHANT_MODULE_EXPORT(char *)
enchant_get_prefix_dir(void); enchant_get_prefix_dir(void);
ENCHANT_MODULE_EXPORT(void) ENCHANT_MODULE_EXPORT(void)
enchant_dict_set_error (EnchantDict * dict, const char * const err); enchant_dict_set_error (EnchantDict * dict, const char * const err);
ENCHANT_MODULE_EXPORT(void) ENCHANT_MODULE_EXPORT(void)
enchant_provider_set_error (EnchantProvider * provider, const char * const err); enchant_provider_set_error (EnchantProvider * provider, const char * const err);
struct str_enchant_dict struct str_enchant_dict
{ {
void *user_data; void *user_data;
void *enchant_private_data; void *enchant_private_data;
int (*check) (struct str_enchant_dict * me, const char *const word, int (*check) (struct str_enchant_dict * me, const char *const word,
size_t len); size_t len);
/* returns utf8*/
char **(*suggest) (struct str_enchant_dict * me, char **(*suggest) (struct str_enchant_dict * me,
const char *const word, size_t len, const char *const word, size_t len,
size_t * out_n_suggs); size_t * out_n_suggs);
void (*add_to_personal) (struct str_enchant_dict * me, void (*add_to_personal) (struct str_enchant_dict * me,
const char *const word, size_t len); const char *const word, size_t len);
void (*add_to_session) (struct str_enchant_dict * me, void (*add_to_session) (struct str_enchant_dict * me,
const char *const word, size_t len); const char *const word, size_t len);
void (*store_replacement) (struct str_enchant_dict * me, void (*store_replacement) (struct str_enchant_dict * me,
const char *const mis, size_t mis_len, const char *const mis, size_t mis_len,
const char *const cor, size_t cor_len); const char *const cor, size_t cor_len);
void (*add_to_exclude) (struct str_enchant_dict * me,
const char *const word, size_t len);
void * _reserved[5]; void * _reserved[5];
}; };
struct str_enchant_provider struct str_enchant_provider
{ {
void *user_data; void *user_data;
void *enchant_private_data; void *enchant_private_data;
EnchantBroker * owner; EnchantBroker * owner;
void (*dispose) (struct str_enchant_provider * me); void (*dispose) (struct str_enchant_provider * me);
EnchantDict *(*request_dict) (struct str_enchant_provider * me, EnchantDict *(*request_dict) (struct str_enchant_provider * me,
const char *const tag); const char *const tag);
void (*dispose_dict) (struct str_enchant_provider * me, void (*dispose_dict) (struct str_enchant_provider * me,
EnchantDict * dict); EnchantDict * dict);
int (*dictionary_exists) (struct str_enchant_provider * me, int (*dictionary_exists) (struct str_enchant_provider * me,
const char *const tag); const char *const tag);
/* const */ char * (*identify) (struct str_enchant_provider * me); /* returns utf8*/
/* const */ char * (*describe) (struct str_enchant_provider * me); const char * (*identify) (struct str_enchant_provider * me);
/* returns utf8*/
const char * (*describe) (struct str_enchant_provider * me);
/* frees string lists returned by list_dicts and dict->suggest */
void (*free_string_list) (struct str_enchant_provider * me, void (*free_string_list) (struct str_enchant_provider * me,
char **str_list); char **str_list);
char ** (*list_dicts) (struct str_enchant_provider * me, char ** (*list_dicts) (struct str_enchant_provider * me,
size_t * out_n_dicts); size_t * out_n_di cts);
void * _reserved[5]; void * _reserved[5];
}; };
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* ENCHANT_H */ #endif /* ENCHANT_H */
 End of changes. 11 change blocks. 
9 lines changed or deleted 17 lines changed or added


 enchant.h   enchant.h 
skipping to change at line 78 skipping to change at line 78
ENCHANT_MODULE_EXPORT (void) ENCHANT_MODULE_EXPORT (void)
enchant_broker_set_ordering (EnchantBroker * broker, enchant_broker_set_ordering (EnchantBroker * broker,
const char * const tag, const char * const tag,
const char * const ordering); const char * const ordering);
/* const */ /* const */
ENCHANT_MODULE_EXPORT(char *) ENCHANT_MODULE_EXPORT(char *)
enchant_broker_get_error (EnchantBroker * broker); enchant_broker_get_error (EnchantBroker * broker);
/** /**
* EnchantBrokerDescribeFn * EnchantBrokerDescribeFn
* @provider_name: The provider's identifier, such as "ispell" or "aspell" * @provider_name: The provider's identifier, such as "ispell" or "aspell"
* @provider_desc: A description of the provider, such as "Aspell 0.53" in UTF8 encoding
* @provider_dll_file: The provider's DLL filename * @provider_desc: A description of the provider, such as "Aspell 0.53" in
UTF8 encoding
* @provider_dll_file: The provider's DLL filename in Glib file encoding (U
TF8 on Windows)
* @user_data: Supplied user data, or %null if you don't care * @user_data: Supplied user data, or %null if you don't care
* *
* Callback used to enumerate and describe Enchant's various providers * Callback used to enumerate and describe Enchant's various providers
*/ */
typedef void (*EnchantBrokerDescribeFn) (const char * const provider_name, typedef void (*EnchantBrokerDescribeFn) (const char * const provider_name,
const char * const provider_desc, const char * const provider_desc,
const char * const provider_dll_fil e, const char * const provider_dll_fil e,
void * user_data); void * user_data);
ENCHANT_MODULE_EXPORT (void) ENCHANT_MODULE_EXPORT (void)
enchant_broker_describe (EnchantBroker * broker, enchant_broker_describe (EnchantBroker * broker,
EnchantBrokerDescribeFn fn, EnchantBrokerDescribeFn fn,
void * user_data); void * user_data);
ENCHANT_MODULE_EXPORT (int) ENCHANT_MODULE_EXPORT (int)
enchant_dict_check (EnchantDict * dict, const char *const word, ssize_ t len); enchant_dict_check (EnchantDict * dict, const char *const word, ssize_ t len);
ENCHANT_MODULE_EXPORT (char **) ENCHANT_MODULE_EXPORT (char **)
enchant_dict_suggest (EnchantDict * dict, const char *const word, enchant_dict_suggest (EnchantDict * dict, const char *const word,
ssize_t len, size_t * out_n_suggs); ssize_t len, size_t * out_n_suggs);
ENCHANT_MODULE_EXPORT (void) ENCHANT_MODULE_EXPORT (void)
enchant_dict_add (EnchantDict * dict, const char *const word,
ssize_t len);
ENCHANT_MODULE_EXPORT (void)
enchant_dict_add_to_session (EnchantDict * dict, const char *const wor d, enchant_dict_add_to_session (EnchantDict * dict, const char *const wor d,
ssize_t len); ssize_t len);
ENCHANT_MODULE_EXPORT (void)
enchant_dict_remove (EnchantDict * dict, const char *const word,
ssize_t len);
ENCHANT_MODULE_EXPORT (void)
enchant_dict_remove_from_session (EnchantDict * dict, const char *cons
t word,
ssize_t len);
ENCHANT_MODULE_EXPORT (int) ENCHANT_MODULE_EXPORT (int)
enchant_dict_is_in_session (EnchantDict * dict, const char *const word enchant_dict_is_added (EnchantDict * dict, const char *const word,
, ssize_t len);
ENCHANT_MODULE_EXPORT (int)
enchant_dict_is_removed (EnchantDict * dict, const char *const word,
ssize_t len); ssize_t len);
ENCHANT_MODULE_EXPORT (void) ENCHANT_MODULE_EXPORT (void)
enchant_dict_store_replacement (EnchantDict * dict, enchant_dict_store_replacement (EnchantDict * dict,
const char *const mis, ssize_t mis_len, const char *const mis, ssize_t mis_len,
const char *const cor, ssize_t cor_len) ; const char *const cor, ssize_t cor_len) ;
ENCHANT_MODULE_EXPORT (void) ENCHANT_MODULE_EXPORT (void)
enchant_dict_add_to_pwl (EnchantDict * dict, const char *const word,
ssize_t len);
ENCHANT_MODULE_EXPORT (void)
enchant_dict_free_string_list (EnchantDict * dict, char **strin g_list); enchant_dict_free_string_list (EnchantDict * dict, char **strin g_list);
#ifndef ENCHANT_DISABLE_DEPRECATED #ifndef ENCHANT_DISABLE_DEPRECATED
ENCHANT_MODULE_EXPORT (void) ENCHANT_MODULE_EXPORT (void)
enchant_dict_free_suggestions (EnchantDict * dict, char **suggestions) ; enchant_dict_free_suggestions (EnchantDict * dict, char **suggestions) ;
ENCHANT_MODULE_EXPORT (void) ENCHANT_MODULE_EXPORT (void)
enchant_dict_add_to_personal (EnchantDict * dict, const char *const wo rd, enchant_dict_add_to_personal (EnchantDict * dict, const char *const wo rd,
ssize_t len); ssize_t len);
ENCHANT_MODULE_EXPORT (void)
enchant_dict_add_to_pwl (EnchantDict * dict, const char *const word,
ssize_t len);
ENCHANT_MODULE_EXPORT (int)
enchant_dict_is_in_session (EnchantDict * dict, const char *const word
,
ssize_t len);
#endif /* ENCHANT_DISABLE_DEPRECATED */ #endif /* ENCHANT_DISABLE_DEPRECATED */
/* const */ /* const */
ENCHANT_MODULE_EXPORT(char *) ENCHANT_MODULE_EXPORT(char *)
enchant_dict_get_error (EnchantDict * dict); enchant_dict_get_error (EnchantDict * dict);
/** /**
* EnchantDictDescribeFn * EnchantDictDescribeFn
* @lang_tag: The dictionary's language tag (eg: en_US, de_AT, ...) * @lang_tag: The dictionary's language tag (eg: en_US, de_AT, ...)
* @provider_name: The provider's name (eg: Aspell) * @provider_name: The provider's name (eg: Aspell) in UTF8 encoding
* @provider_desc: The provider's description (eg: Aspell 0.50.3) * @provider_desc: The provider's description (eg: Aspell 0.50.3) in UTF8 e
* @provider_file: The DLL/SO where this dict's provider was loaded from ncoding
* @provider_file: The DLL/SO where this dict's provider was loaded from in
Glib file encoding (UTF8 on Windows)
* @user_data: Supplied user data, or %null if you don't care * @user_data: Supplied user data, or %null if you don't care
* *
* Callback used to describe an individual dictionary * Callback used to describe an individual dictionary
*/ */
typedef void (*EnchantDictDescribeFn) (const char * const lang_tag, typedef void (*EnchantDictDescribeFn) (const char * const lang_tag,
const char * const provider_name, const char * const provider_name,
const char * const provider_desc, const char * const provider_desc,
const char * const provider_file, const char * const provider_file,
void * user_data); void * user_data);
 End of changes. 7 change blocks. 
11 lines changed or deleted 32 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/