Browse Source

* PChar -> PAnsiChar

Michaël Van Canneyt 2 years ago
parent
commit
62accca3a9

+ 31 - 31
packages/aspell/src/aspell.pp

@@ -29,9 +29,9 @@ uses
 
   {************************* mutable container ************************* }
 
-  function aspell_mutable_container_add(ths:PAspellMutableContainer; to_add:pchar):cint;cdecl;external libaspell name 'aspell_mutable_container_add';
+  function aspell_mutable_container_add(ths:PAspellMutableContainer; to_add:PAnsiChar):cint;cdecl;external libaspell name 'aspell_mutable_container_add';
 
-  function aspell_mutable_container_remove(ths:PAspellMutableContainer; to_rem:pchar):cint;cdecl;external libaspell name 'aspell_mutable_container_remove';
+  function aspell_mutable_container_remove(ths:PAspellMutableContainer; to_rem:PAnsiChar):cint;cdecl;external libaspell name 'aspell_mutable_container_remove';
 
   procedure aspell_mutable_container_clear(ths:PAspellMutableContainer);cdecl;external libaspell name 'aspell_mutable_container_clear';
 
@@ -59,7 +59,7 @@ uses
 
     function aspell_config_error_number(ths:PAspellConfig):cuint;cdecl;external libaspell name 'aspell_config_error_number';
 
-    function aspell_config_error_message(ths:PAspellConfig):pchar;cdecl;external libaspell name 'aspell_config_error_message';
+    function aspell_config_error_message(ths:PAspellConfig):PAnsiChar;cdecl;external libaspell name 'aspell_config_error_message';
 
     function aspell_config_error(ths:PAspellConfig):PAspellError;cdecl;external libaspell name 'aspell_config_error';
 
@@ -76,7 +76,7 @@ uses
      * not valid. The pointer returned is valid for
      * the lifetime of the object.  }
 
-    function aspell_config_keyinfo(ths:PAspellConfig; key:pchar):PAspellKeyInfo;cdecl;external libaspell name 'aspell_config_keyinfo';
+    function aspell_config_keyinfo(ths:PAspellConfig; key:PAnsiChar):PAspellKeyInfo;cdecl;external libaspell name 'aspell_config_keyinfo';
 
     { Returns a newly allocated enumeration of all
      * the possible objects this config class uses.  }
@@ -90,7 +90,7 @@ uses
      * the key is not valid. Uses the temporary
      * string.  }
 
-    function aspell_config_get_default(ths:PAspellConfig; key:pchar):pchar;cdecl;external libaspell name 'aspell_config_get_default';
+    function aspell_config_get_default(ths:PAspellConfig; key:PAnsiChar):PAnsiChar;cdecl;external libaspell name 'aspell_config_get_default';
 
     { Returns a newly allocated enumeration of all
      * the key/value pairs. This DOES not include ones
@@ -109,7 +109,7 @@ uses
      * a list and you are trying to set its directory,
      * it sets error_num to PERROR_LIST_SET  }
 
-    function aspell_config_replace(ths:PAspellConfig; key:pchar; value:pchar):cint;cdecl;external libaspell name 'aspell_config_replace';
+    function aspell_config_replace(ths:PAspellConfig; key:PAnsiChar; value:PAnsiChar):cint;cdecl;external libaspell name 'aspell_config_replace';
 
     { Remove a key and returns TRUE if it exists
      * otherwise return FALSE. This effectively sets
@@ -122,28 +122,28 @@ uses
      * changed then it sets error_num to
      * PERROR_CANT_CHANGE_VALUE  }
 
-    function aspell_config_remove(ths:PAspellConfig; key:pchar):cint;cdecl;external libaspell name 'aspell_config_remove';
+    function aspell_config_remove(ths:PAspellConfig; key:PAnsiChar):cint;cdecl;external libaspell name 'aspell_config_remove';
 
-    function aspell_config_have(ths:PAspellConfig; key:pchar):cint;cdecl;external libaspell name 'aspell_config_have';
+    function aspell_config_have(ths:PAspellConfig; key:PAnsiChar):cint;cdecl;external libaspell name 'aspell_config_have';
 
     { Returns NULL on error.  }
 
-    function aspell_config_retrieve(ths:PAspellConfig; key:pchar):pchar;cdecl;external libaspell name 'aspell_config_retrieve';
+    function aspell_config_retrieve(ths:PAspellConfig; key:PAnsiChar):PAnsiChar;cdecl;external libaspell name 'aspell_config_retrieve';
 
-    function aspell_config_retrieve_list(ths:PAspellConfig; key:pchar; lst:PAspellMutableContainer):cint;cdecl;external libaspell name 'aspell_config_retrieve_list';
+    function aspell_config_retrieve_list(ths:PAspellConfig; key:PAnsiChar; lst:PAspellMutableContainer):cint;cdecl;external libaspell name 'aspell_config_retrieve_list';
 
     { In "ths" Aspell configuration, search for a
      * character string matching "key" string.
      * If "key" is found then return 1 else return 0.
      * If error encountered, then return -1.  }
 
-    function aspell_config_retrieve_bool(ths:PAspellConfig; key:pchar):cint;cdecl;external libaspell name 'aspell_config_retrieve_bool';
+    function aspell_config_retrieve_bool(ths:PAspellConfig; key:PAnsiChar):cint;cdecl;external libaspell name 'aspell_config_retrieve_bool';
 
     { In "ths" Aspell configuration, search for an
      * integer value matching "key" string.
      * Return -1 on error.  }
 
-    function aspell_config_retrieve_int(ths:PAspellConfig; key:pchar):cint;cdecl;external libaspell name 'aspell_config_retrieve_int';
+    function aspell_config_retrieve_int(ths:PAspellConfig; key:PAnsiChar):cint;cdecl;external libaspell name 'aspell_config_retrieve_int';
 
     {******************************* error ******************************* }
 
@@ -153,7 +153,7 @@ uses
 
     function aspell_error_number(ths:PAspellCanHaveError):cuint;cdecl;external libaspell name 'aspell_error_number';
 
-    function aspell_error_message(ths:PAspellCanHaveError):pchar;cdecl;external libaspell name 'aspell_error_message';
+    function aspell_error_message(ths:PAspellCanHaveError):PAnsiChar;cdecl;external libaspell name 'aspell_error_message';
 
     function aspell_error(ths:PAspellCanHaveError):PAspellError;cdecl;external libaspell name 'aspell_error';
 
@@ -173,7 +173,7 @@ uses
 
     function aspell_speller_error_number(ths:PAspellSpeller):cuint;cdecl;external libaspell name 'aspell_speller_error_number';
 
-    function aspell_speller_error_message(ths:PAspellSpeller):pchar;cdecl;external libaspell name 'aspell_speller_error_message';
+    function aspell_speller_error_message(ths:PAspellSpeller):PAnsiChar;cdecl;external libaspell name 'aspell_speller_error_message';
 
     function aspell_speller_error(ths:PAspellSpeller):PAspellError;cdecl;external libaspell name 'aspell_speller_error';
 
@@ -181,15 +181,15 @@ uses
     { Returns 0 if it is not in the dictionary,
      * 1 if it is, or -1 on error.  }
 
-    function aspell_speller_check(ths:PAspellSpeller; word:pchar; word_size:cint):cint;cdecl;external libaspell name 'aspell_speller_check';
+    function aspell_speller_check(ths:PAspellSpeller; word:PAnsiChar; word_size:cint):cint;cdecl;external libaspell name 'aspell_speller_check';
 
     { Add this word to your own personal word list.  }
 
-    function aspell_speller_add_to_personal(ths:PAspellSpeller; word:pchar; word_size:cint):cint;cdecl;external libaspell name 'aspell_speller_add_to_personal';
+    function aspell_speller_add_to_personal(ths:PAspellSpeller; word:PAnsiChar; word_size:cint):cint;cdecl;external libaspell name 'aspell_speller_add_to_personal';
 
     { Add this word to the current spelling session.  }
 
-    function aspell_speller_add_to_session(ths:PAspellSpeller; word:pchar; word_size:cint):cint;cdecl;external libaspell name 'aspell_speller_add_to_session';
+    function aspell_speller_add_to_session(ths:PAspellSpeller; word:PAnsiChar; word_size:cint):cint;cdecl;external libaspell name 'aspell_speller_add_to_session';
 
     { This is your own personal word list file plus
      * any extra words added during this session to
@@ -217,9 +217,9 @@ uses
      * The word list returned by suggest is only
      * valid until the next call to suggest.  }
 
-    function aspell_speller_suggest(ths:PAspellSpeller; word:pchar; word_size:cint):PAspellWordList;cdecl;external libaspell name 'aspell_speller_suggest';
+    function aspell_speller_suggest(ths:PAspellSpeller; word:PAnsiChar; word_size:cint):PAspellWordList;cdecl;external libaspell name 'aspell_speller_suggest';
 
-    function aspell_speller_store_replacement(ths:PAspellSpeller; mis:pchar; mis_size:cint; cor:pchar; cor_size:cint):cint;cdecl;external libaspell name 'aspell_speller_store_replacement';
+    function aspell_speller_store_replacement(ths:PAspellSpeller; mis:PAnsiChar; mis_size:cint; cor:PAnsiChar; cor_size:cint):cint;cdecl;external libaspell name 'aspell_speller_store_replacement';
 
     {******************************* filter ******************************* }
 
@@ -227,7 +227,7 @@ uses
 
     function aspell_filter_error_number(ths:PAspellFilter):cuint;cdecl;external libaspell name 'aspell_filter_error_number';
 
-    function aspell_filter_error_message(ths:PAspellFilter):pchar;cdecl;external libaspell name 'aspell_filter_error_message';
+    function aspell_filter_error_message(ths:PAspellFilter):PAnsiChar;cdecl;external libaspell name 'aspell_filter_error_message';
 
     function aspell_filter_error(ths:PAspellFilter):PAspellError;cdecl;external libaspell name 'aspell_filter_error';
 
@@ -239,7 +239,7 @@ uses
 
     function aspell_document_checker_error_number(ths:PAspellDocumentChecker):cuint;cdecl;external libaspell name 'aspell_document_checker_error_number';
 
-    function aspell_document_checker_error_message(ths:PAspellDocumentChecker):pchar;cdecl;external libaspell name 'aspell_document_checker_error_message';
+    function aspell_document_checker_error_message(ths:PAspellDocumentChecker):PAnsiChar;cdecl;external libaspell name 'aspell_document_checker_error_message';
 
     function aspell_document_checker_error(ths:PAspellDocumentChecker):PAspellError;cdecl;external libaspell name 'aspell_document_checker_error';
 
@@ -271,7 +271,7 @@ uses
      * order, skipping strings or passing them in
      * more than once may lead to undefined results.  }
 
-    procedure aspell_document_checker_process(ths:PAspellDocumentChecker; str:pchar; size:cint);cdecl;external libaspell name 'aspell_document_checker_process';
+    procedure aspell_document_checker_process(ths:PAspellDocumentChecker; str:PAnsiChar; size:cint);cdecl;external libaspell name 'aspell_document_checker_process';
 
     { Returns the next misspelled word in the
      * processed string.  If there are no more
@@ -303,7 +303,7 @@ uses
 
     function aspell_string_enumeration_at_end(ths:PAspellStringEnumeration):cint;cdecl;external libaspell name 'aspell_string_enumeration_at_end';
 
-    function aspell_string_enumeration_next(ths:PAspellStringEnumeration):pchar;cdecl;external libaspell name 'aspell_string_enumeration_next';
+    function aspell_string_enumeration_next(ths:PAspellStringEnumeration):PAnsiChar;cdecl;external libaspell name 'aspell_string_enumeration_next';
 
     {******************************** info ******************************** }
 
@@ -353,9 +353,9 @@ uses
 
     function aspell_string_list_elements(ths:PAspellStringList):PAspellStringEnumeration;cdecl;external libaspell name 'aspell_string_list_elements';
 
-    function aspell_string_list_add(ths:PAspellStringList; to_add:pchar):cint;cdecl;external libaspell name 'aspell_string_list_add';
+    function aspell_string_list_add(ths:PAspellStringList; to_add:PAnsiChar):cint;cdecl;external libaspell name 'aspell_string_list_add';
 
-    function aspell_string_list_remove(ths:PAspellStringList; to_rem:pchar):cint;cdecl;external libaspell name 'aspell_string_list_remove';
+    function aspell_string_list_remove(ths:PAspellStringList; to_rem:PAnsiChar):cint;cdecl;external libaspell name 'aspell_string_list_remove';
 
     procedure aspell_string_list_clear(ths:PAspellStringList);cdecl;external libaspell name 'aspell_string_list_clear';
 
@@ -371,9 +371,9 @@ uses
 
     function new_aspell_string_map():PAspellStringMap;cdecl;external libaspell name 'new_aspell_string_map';
 
-    function aspell_string_map_add(ths:PAspellStringMap; to_add:pchar):cint;cdecl;external libaspell name 'aspell_string_map_add';
+    function aspell_string_map_add(ths:PAspellStringMap; to_add:PAnsiChar):cint;cdecl;external libaspell name 'aspell_string_map_add';
 
-    function aspell_string_map_remove(ths:PAspellStringMap; to_rem:pchar):cint;cdecl;external libaspell name 'aspell_string_map_remove';
+    function aspell_string_map_remove(ths:PAspellStringMap; to_rem:PAnsiChar):cint;cdecl;external libaspell name 'aspell_string_map_remove';
 
     procedure aspell_string_map_clear(ths:PAspellStringMap);cdecl;external libaspell name 'aspell_string_map_clear';
 
@@ -395,20 +395,20 @@ uses
      * Will NOT overwrite an existing entry.
      * Returns FALSE if the element already exists.  }
 
-    function aspell_string_map_insert(ths:PAspellStringMap; key:pchar; value:pchar):cint;cdecl;external libaspell name 'aspell_string_map_insert';
+    function aspell_string_map_insert(ths:PAspellStringMap; key:PAnsiChar; value:PAnsiChar):cint;cdecl;external libaspell name 'aspell_string_map_insert';
 
     { Insert a new element.
      * Will overwrite an existing entry.
      * Always returns TRUE.  }
 
-    function aspell_string_map_replace(ths:PAspellStringMap; key:pchar; value:pchar):cint;cdecl;external libaspell name 'aspell_string_map_replace';
+    function aspell_string_map_replace(ths:PAspellStringMap; key:PAnsiChar; value:PAnsiChar):cint;cdecl;external libaspell name 'aspell_string_map_replace';
 
     { Looks up an element and returns the value.
      * Returns NULL if the element does not exist.
      * Returns an empty string if the element exists
      * but has a NULL value.  }
 
-    function aspell_string_map_lookup(ths:PAspellStringMap; key:pchar):pchar;cdecl;external libaspell name 'aspell_string_map_lookup';
+    function aspell_string_map_lookup(ths:PAspellStringMap; key:PAnsiChar):PAnsiChar;cdecl;external libaspell name 'aspell_string_map_lookup';
 
     {********************** string pair enumeration ********************** }
 
@@ -429,7 +429,7 @@ uses
      * caches will be reset. Current caches are "encode",
      * "decode", "dictionary", "language", and "keyboard".  }
 
-    function aspell_reset_cache(which:pchar):cint;cdecl;external libaspell name 'aspell_reset_cache';
+    function aspell_reset_cache(which:PAnsiChar):cint;cdecl;external libaspell name 'aspell_reset_cache';
     
   function aspell_init(const libn: ansistring): Boolean;
   function aspell_loaded: Boolean;

+ 32 - 32
packages/aspell/src/aspelldyn.pp

@@ -35,9 +35,9 @@ uses
 
   {************************* mutable container ************************* }
 var
-  aspell_mutable_container_add: function(ths:PAspellMutableContainer; to_add:pchar):cint;cdecl;
+  aspell_mutable_container_add: function(ths:PAspellMutableContainer; to_add:PAnsiChar):cint;cdecl;
 
-  aspell_mutable_container_remove: function(ths:PAspellMutableContainer; to_rem:pchar):cint;cdecl;
+  aspell_mutable_container_remove: function(ths:PAspellMutableContainer; to_rem:PAnsiChar):cint;cdecl;
 
   aspell_mutable_container_clear: procedure(ths:PAspellMutableContainer);cdecl;
 
@@ -65,7 +65,7 @@ var
 
   aspell_config_error_number: function(ths:PAspellConfig):cuint;cdecl;
 
-  aspell_config_error_message: function(ths:PAspellConfig):pchar;cdecl;
+  aspell_config_error_message: function(ths:PAspellConfig):PAnsiChar;cdecl;
 
   aspell_config_error: function(ths:PAspellConfig):PAspellError;cdecl;
 
@@ -82,7 +82,7 @@ var
        * not valid. The pointer returned is valid for
        * the lifetime of the object.  }
 
-  aspell_config_keyinfo: function(ths:PAspellConfig; key:pchar):PAspellKeyInfo;cdecl;
+  aspell_config_keyinfo: function(ths:PAspellConfig; key:PAnsiChar):PAspellKeyInfo;cdecl;
 
       { Returns a newly allocated enumeration of all
        * the possible objects this config class uses.  }
@@ -96,7 +96,7 @@ var
        * the key is not valid. Uses the temporary
        * string.  }
 
-  aspell_config_get_default: function(ths:PAspellConfig; key:pchar):pchar;cdecl;
+  aspell_config_get_default: function(ths:PAspellConfig; key:PAnsiChar):PAnsiChar;cdecl;
 
       { Returns a newly allocated enumeration of all
        * the key/value pairs. This DOES not include ones
@@ -115,7 +115,7 @@ var
        * a list and you are trying to set its directory,
        * it sets error_num to PERROR_LIST_SET  }
 
-  aspell_config_replace: function(ths:PAspellConfig; key:pchar; value:pchar):cint;cdecl;
+  aspell_config_replace: function(ths:PAspellConfig; key:PAnsiChar; value:PAnsiChar):cint;cdecl;
 
       { Remove a key and returns TRUE if it exists
        * otherwise return FALSE. This effectively sets
@@ -128,28 +128,28 @@ var
        * changed then it sets error_num to
        * PERROR_CANT_CHANGE_VALUE  }
 
-  aspell_config_remove: function(ths:PAspellConfig; key:pchar):cint;cdecl;
+  aspell_config_remove: function(ths:PAspellConfig; key:PAnsiChar):cint;cdecl;
 
-  aspell_config_have: function(ths:PAspellConfig; key:pchar):cint;cdecl;
+  aspell_config_have: function(ths:PAspellConfig; key:PAnsiChar):cint;cdecl;
 
       { Returns NULL on error.  }
 
-  aspell_config_retrieve: function(ths:PAspellConfig; key:pchar):pchar;cdecl;
+  aspell_config_retrieve: function(ths:PAspellConfig; key:PAnsiChar):PAnsiChar;cdecl;
 
-  aspell_config_retrieve_list: function(ths:PAspellConfig; key:pchar; lst:PAspellMutableContainer):cint;cdecl;
+  aspell_config_retrieve_list: function(ths:PAspellConfig; key:PAnsiChar; lst:PAspellMutableContainer):cint;cdecl;
 
       { In "ths" Aspell configuration, search for a
        * character string matching "key" string.
        * If "key" is found then return 1 else return 0.
        * If error encountered, then return -1.  }
 
-  aspell_config_retrieve_bool: function(ths:PAspellConfig; key:pchar):cint;cdecl;
+  aspell_config_retrieve_bool: function(ths:PAspellConfig; key:PAnsiChar):cint;cdecl;
 
       { In "ths" Aspell configuration, search for an
        * integer value matching "key" string.
        * Return -1 on error.  }
 
-  aspell_config_retrieve_int: function(ths:PAspellConfig; key:pchar):cint;cdecl;
+  aspell_config_retrieve_int: function(ths:PAspellConfig; key:PAnsiChar):cint;cdecl;
 
       {******************************* error ******************************* }
 
@@ -159,7 +159,7 @@ var
 
   aspell_error_number: function(ths:PAspellCanHaveError):cuint;cdecl;
 
-  aspell_error_message: function(ths:PAspellCanHaveError):pchar;cdecl;
+  aspell_error_message: function(ths:PAspellCanHaveError):PAnsiChar;cdecl;
 
   aspell_error: function(ths:PAspellCanHaveError):PAspellError;cdecl;
 
@@ -179,7 +179,7 @@ var
 
   aspell_speller_error_number: function(ths:PAspellSpeller):cuint;cdecl;
 
-  aspell_speller_error_message: function(ths:PAspellSpeller):pchar;cdecl;
+  aspell_speller_error_message: function(ths:PAspellSpeller):PAnsiChar;cdecl;
 
   aspell_speller_error: function(ths:PAspellSpeller):PAspellError;cdecl;
 
@@ -187,15 +187,15 @@ var
       { Returns 0 if it is not in the dictionary,
        * 1 if it is, or -1 on error.  }
 
-  aspell_speller_check: function(ths:PAspellSpeller; word:pchar; word_size:cint):cint;cdecl;
+  aspell_speller_check: function(ths:PAspellSpeller; word:PAnsiChar; word_size:cint):cint;cdecl;
 
       { Add this word to your own personal word list.  }
 
-  aspell_speller_add_to_personal: function(ths:PAspellSpeller; word:pchar; word_size:cint):cint;cdecl;
+  aspell_speller_add_to_personal: function(ths:PAspellSpeller; word:PAnsiChar; word_size:cint):cint;cdecl;
 
       { Add this word to the current spelling session.  }
 
-  aspell_speller_add_to_session: function(ths:PAspellSpeller; word:pchar; word_size:cint):cint;cdecl;
+  aspell_speller_add_to_session: function(ths:PAspellSpeller; word:PAnsiChar; word_size:cint):cint;cdecl;
 
       { This is your own personal word list file plus
        * any extra words added during this session to
@@ -223,9 +223,9 @@ var
        * The word list returned by suggest is only
        * valid until the next call to suggest.  }
 
-  aspell_speller_suggest: function(ths:PAspellSpeller; word:pchar; word_size:cint):PAspellWordList;cdecl;
+  aspell_speller_suggest: function(ths:PAspellSpeller; word:PAnsiChar; word_size:cint):PAspellWordList;cdecl;
 
-  aspell_speller_store_replacement: function(ths:PAspellSpeller; mis:pchar; mis_size:cint; cor:pchar; cor_size:cint):cint;cdecl;
+  aspell_speller_store_replacement: function(ths:PAspellSpeller; mis:PAnsiChar; mis_size:cint; cor:PAnsiChar; cor_size:cint):cint;cdecl;
 
       {******************************* filter ******************************* }
 
@@ -233,7 +233,7 @@ var
 
   aspell_filter_error_number: function(ths:PAspellFilter):cuint;cdecl;
 
-  aspell_filter_error_message: function(ths:PAspellFilter):pchar;cdecl;
+  aspell_filter_error_message: function(ths:PAspellFilter):PAnsiChar;cdecl;
 
   aspell_filter_error: function(ths:PAspellFilter):PAspellError;cdecl;
 
@@ -245,7 +245,7 @@ var
 
   aspell_document_checker_error_number: function(ths:PAspellDocumentChecker):cuint;cdecl;
 
-  aspell_document_checker_error_message: function(ths:PAspellDocumentChecker):pchar;cdecl;
+  aspell_document_checker_error_message: function(ths:PAspellDocumentChecker):PAnsiChar;cdecl;
 
   aspell_document_checker_error: function(ths:PAspellDocumentChecker):PAspellError;cdecl;
 
@@ -277,7 +277,7 @@ var
        * order, skipping strings or passing them in
        * more than once may lead to undefined results.  }
 
-  aspell_document_checker_process: procedure(ths:PAspellDocumentChecker; str:pchar; size:cint);cdecl;
+  aspell_document_checker_process: procedure(ths:PAspellDocumentChecker; str:PAnsiChar; size:cint);cdecl;
 
       { Returns the next misspelled word in the
        * processed string.  If there are no more
@@ -309,7 +309,7 @@ var
 
   aspell_string_enumeration_at_end: function(ths:PAspellStringEnumeration):cint;cdecl;
 
-  aspell_string_enumeration_next: function(ths:PAspellStringEnumeration):pchar;cdecl;
+  aspell_string_enumeration_next: function(ths:PAspellStringEnumeration):PAnsiChar;cdecl;
 
       {******************************** info ******************************** }
 
@@ -359,9 +359,9 @@ var
 
   aspell_string_list_elements: function(ths:PAspellStringList):PAspellStringEnumeration;cdecl;
 
-  aspell_string_list_add: function(ths:PAspellStringList; to_add:pchar):cint;cdecl;
+  aspell_string_list_add: function(ths:PAspellStringList; to_add:PAnsiChar):cint;cdecl;
 
-  aspell_string_list_remove: function(ths:PAspellStringList; to_rem:pchar):cint;cdecl;
+  aspell_string_list_remove: function(ths:PAspellStringList; to_rem:PAnsiChar):cint;cdecl;
 
   aspell_string_list_clear: procedure(ths:PAspellStringList);cdecl;
 
@@ -377,9 +377,9 @@ var
 
   new_aspell_string_map: function():PAspellStringMap;cdecl;
 
-  aspell_string_map_add: function(ths:PAspellStringMap; to_add:pchar):cint;cdecl;
+  aspell_string_map_add: function(ths:PAspellStringMap; to_add:PAnsiChar):cint;cdecl;
 
-  aspell_string_map_remove: function(ths:PAspellStringMap; to_rem:pchar):cint;cdecl;
+  aspell_string_map_remove: function(ths:PAspellStringMap; to_rem:PAnsiChar):cint;cdecl;
 
   aspell_string_map_clear: procedure(ths:PAspellStringMap);cdecl;
 
@@ -401,20 +401,20 @@ var
        * Will NOT overwrite an existing entry.
        * Returns FALSE if the element already exists.  }
 
-  aspell_string_map_insert: function(ths:PAspellStringMap; key:pchar; value:pchar):cint;cdecl;
+  aspell_string_map_insert: function(ths:PAspellStringMap; key:PAnsiChar; value:PAnsiChar):cint;cdecl;
 
       { Insert a new element.
        * Will overwrite an existing entry.
        * Always returns TRUE.  }
 
-  aspell_string_map_replace: function(ths:PAspellStringMap; key:pchar; value:pchar):cint;cdecl;
+  aspell_string_map_replace: function(ths:PAspellStringMap; key:PAnsiChar; value:PAnsiChar):cint;cdecl;
 
       { Looks up an element and returns the value.
        * Returns NULL if the element does not exist.
        * Returns an empty string if the element exists
        * but has a NULL value.  }
 
-  aspell_string_map_lookup: function(ths:PAspellStringMap; key:pchar):pchar;cdecl;
+  aspell_string_map_lookup: function(ths:PAspellStringMap; key:PAnsiChar):PAnsiChar;cdecl;
 
       {********************** string pair enumeration ********************** }
 
@@ -435,7 +435,7 @@ var
        * caches will be reset. Current caches are "encode",
        * "decode", "dictionary", "language", and "keyboard".  }
 
-  aspell_reset_cache: function(which:pchar):cint;cdecl;
+  aspell_reset_cache: function(which:PAnsiChar):cint;cdecl;
 
   function aspell_init(const libn: ansistring): Boolean;
   function aspell_loaded: Boolean;
@@ -462,7 +462,7 @@ var
   buftype:longint;
   res:longint;
   key,rkey:hkey;
-  p,sp:pchar;
+  p,sp:PAnsiChar;
 
 begin
   RegistryQueryValue:='';

+ 16 - 16
packages/aspell/src/aspelltypes.inc

@@ -23,7 +23,7 @@
      AspellTypeId = record
          case longint of
             0 : ( num : cuint );
-            1 : ( str : array[0..3] of char );
+            1 : ( str : array[0..3] of AnsiChar );
          end;
 
     {****************************** key info ****************************** }
@@ -37,10 +37,10 @@
 
        PAspellKeyInfo = ^AspellKeyInfo;
        AspellKeyInfo = record
-            name : pchar;
+            name : PAnsiChar;
             _type : AspellKeyInfoType;
-            def : pchar;
-            desc : pchar;
+            def : PAnsiChar;
+            desc : PAnsiChar;
             flags : cint;
             other_data : cint;
          end;
@@ -50,14 +50,14 @@
        PAspellErrorInfo = ^AspellErrorInfo;
        AspellErrorInfo = record
             isa : PAspellErrorInfo;
-            mesg : pchar;
+            mesg : PAnsiChar;
             num_parms : cuint;
-            parms : array[0..2] of pchar;
+            parms : array[0..2] of PAnsiChar;
          end;
 
        PAspellError = ^AspellError;
        AspellError = record
-            mesg : pchar;
+            mesg : PAnsiChar;
             err : PAspellErrorInfo;
          end;
 
@@ -73,9 +73,9 @@
 
        PAspellModuleInfo = ^AspellModuleInfo;
        AspellModuleInfo = record
-            name : pchar;
+            name : PAnsiChar;
             order_num : double;
-            lib_dir : pchar;
+            lib_dir : PAnsiChar;
             dict_dirs : PAspellStringList;
             dict_exts : PAspellStringList;
          end;
@@ -91,7 +91,7 @@
        * variety of dictionary from other dictionaries
        * which may have the same language and size.  }
 
-    { A two char digit code describing the size of
+    { A two AnsiChar digit code describing the size of
        * the dictionary: 10=tiny, 20=really small,
        * 30=small, 40=med-small, 50=med, 60=med-large,
        * 70=large, 80=huge, 90=insane.  Please check
@@ -101,11 +101,11 @@
 
        PAspellDictInfo = ^AspellDictInfo;
        AspellDictInfo = record
-            name : pchar;
-            code : pchar;
-            jargon : pchar;
+            name : PAnsiChar;
+            code : PAnsiChar;
+            jargon : PAnsiChar;
             size : cint;
-            size_str : pchar;
+            size_str : PAnsiChar;
             module : PAspellModuleInfo;
          end;
 
@@ -113,7 +113,7 @@
 
        PAspellStringPair = ^AspellStringPair;
        AspellStringPair = record
-            first : pchar;
-            second : pchar;
+            first : PAnsiChar;
+            second : PAnsiChar;
          end;
 

+ 10 - 10
packages/aspell/src/spellcheck.pp

@@ -50,7 +50,7 @@ type
    private
     FSpeller: PAspellSpeller;
     FLastError: string;
-    function DoCreateSpeller(Lang, Enc, aMode: pChar): PAspellSpeller;
+    function DoCreateSpeller(Lang, Enc, aMode: PAnsiChar): PAspellSpeller;
    protected
     procedure CreateSpeller; override;
     procedure FreeSpeller; override;
@@ -133,7 +133,7 @@ end;
 
 { TWordSpeller }
 
-function TWordSpeller.DoCreateSpeller(Lang, Enc, aMode: pChar): PAspellSpeller;
+function TWordSpeller.DoCreateSpeller(Lang, Enc, aMode: PAnsiChar): PAspellSpeller;
 var
   Error: Paspellcanhaveerror;
 begin
@@ -163,13 +163,13 @@ begin
   FLastError := '';
   FreeSpeller;
 
-  FSpeller := DoCreateSpeller(pChar(FLanguage), pChar(FEncoding), pChar(FMode));
+  FSpeller := DoCreateSpeller(PAnsiChar(FLanguage), PAnsiChar(FEncoding), PAnsiChar(FMode));
   if not Assigned(FSpeller) then
-    FSpeller := DoCreateSpeller(nil, pChar(FEncoding), pChar(FMode));
+    FSpeller := DoCreateSpeller(nil, PAnsiChar(FEncoding), PAnsiChar(FMode));
   if not Assigned(FSpeller) then
-    FSpeller := DoCreateSpeller(nil, pChar(FEncoding), nil);
+    FSpeller := DoCreateSpeller(nil, PAnsiChar(FEncoding), nil);
   if not Assigned(FSpeller) then
-    FSpeller := DoCreateSpeller(nil, nil, pChar(FMode));
+    FSpeller := DoCreateSpeller(nil, nil, PAnsiChar(FMode));
   if not Assigned(FSpeller) then
     FSpeller := DoCreateSpeller(nil, nil, nil);
 
@@ -189,13 +189,13 @@ function TWordSpeller.SpellCheck(const Word: string): TSuggestionArray;
 var
   sgs: Paspellwordlist;
   elm: Paspellstringenumeration;
-  tmp: pChar;
+  tmp: PAnsiChar;
   i: Integer = 0;
 begin
   SetLength(Result, 0);
 
-  if aspell_speller_check(FSpeller, pChar(Word), Length(Word)) = 0 then begin
-    sgs := aspell_speller_suggest(FSpeller, pChar(Word), Length(Word));
+  if aspell_speller_check(FSpeller, PAnsiChar(Word), Length(Word)) = 0 then begin
+    sgs := aspell_speller_suggest(FSpeller, PAnsiChar(Word), Length(Word));
     elm := aspell_word_list_elements(sgs);
 
     repeat
@@ -272,7 +272,7 @@ var
   i, Count: Integer;
   Token: AspellToken;
 begin
-  aspell_document_checker_process(FChecker, pChar(aLine), Length(aLine));
+  aspell_document_checker_process(FChecker, PAnsiChar(aLine), Length(aLine));
 
   SetLength(Result, CHUNK_SIZE);
   i := 0;