? T.diff
Index: barbarisms.cpp
===================================================================
RCS file: /cvsroot/abi/src/other/spell/xp/barbarisms.cpp,v
retrieving revision 1.16
diff -u -r1.16 barbarisms.cpp
--- barbarisms.cpp	29 Dec 2003 11:42:49 -0000	1.16
+++ barbarisms.cpp	19 Mar 2004 00:29:21 -0000
@@ -34,14 +34,14 @@
 
 BarbarismChecker::~BarbarismChecker()
 {	  
-	UT_StringPtrMap::UT_Cursor _hc1(&m_map);		
+	UT_GenericStringMap<UT_GenericVector<UT_UCS4Char *>*>::UT_Cursor _hc1(&m_map);		
 
-    for (UT_Vector* pVec = (UT_Vector*) _hc1.first(); _hc1.is_valid(); pVec = (UT_Vector*) _hc1.next() ) 
+    for (UT_GenericVector<UT_UCS4Char *>* pVec = _hc1.first(); _hc1.is_valid(); pVec = _hc1.next() ) 
 	{ 
 		if (pVec)									
 		{
 			for (UT_uint32 i=0; i < pVec->getItemCount(); i++)
-				delete (char *)pVec->getNthItem(i);
+				delete pVec->getNthItem(i);
 				
 			delete pVec;			
 		}
@@ -100,7 +100,7 @@
 	Looks for an exact case match of the suggestion
 	Returns true if word is a barbarism
 */
-bool BarbarismChecker::suggestExactWord(const UT_UCSChar *word32, size_t length, UT_Vector* pVecsugg)
+bool BarbarismChecker::suggestExactWord(const UT_UCSChar *word32, size_t length, UT_GenericVector<UT_UCSChar*>* pVecsugg)
 {
 	const char* pUTF8;
 	const UT_UCS4Char *pWord;
@@ -112,7 +112,7 @@
 
 	pUTF8 = stUTF8.utf8_str();
 
-	UT_Vector* vec = static_cast<UT_Vector*>(const_cast<void *>(m_map.pick(pUTF8)));
+	UT_GenericVector<UT_UCS4Char *>* vec = m_map.pick(pUTF8);
 	if (!vec)
 		return false;
 
@@ -123,12 +123,12 @@
 
 	for (UT_uint32 iItem = nItems; iItem; --iItem)
 	{
-		pWord = static_cast<UT_UCS4Char *>(vec->getNthItem(iItem - 1));
+		pWord = vec->getNthItem(iItem - 1);
 		nSize = sizeof(UT_UCS4Char) * (UT_UCS4_strlen(pWord) + 1);
 		suggest32 = static_cast<UT_UCS4Char*>(malloc(nSize));
 		memcpy (suggest32, pWord, nSize);
 		
-		pVecsugg->insertItemAt(static_cast<void *>(suggest32), 0);
+		pVecsugg->insertItemAt(suggest32, 0);
 	}
 
 	return true;
@@ -143,7 +143,7 @@
 
 	Returns true if word is a barbarism
 */
-bool BarbarismChecker::suggestWord(const UT_UCSChar *word32, size_t length, UT_Vector* pVecsugg)
+bool BarbarismChecker::suggestWord(const UT_UCSChar *word32, size_t length, UT_GenericVector<UT_UCSChar*>* pVecsugg)
 {
 	bool bIsBarbarism = false;
 	bool bIsLower = true;
@@ -207,7 +207,7 @@
 			/* Make the first letter of all the results uppercase */
 			for (UT_uint32 iItem = nItems; iItem; --iItem)
 			{
-				pSug = static_cast<UT_UCSChar *>(pVecsugg->getNthItem(iItem - 1));
+				pSug = pVecsugg->getNthItem(iItem - 1);
 				*pSug = UT_UCS4_toupper(*pSug);
 			}
 		}
@@ -236,7 +236,7 @@
 		const char * word = UT_getAttribute ("word", atts);
 		if (word != NULL)
 		{
-			m_pCurVector = new UT_Vector();
+			m_pCurVector = new UT_GenericVector<UT_UCS4Char *>();
 			m_map.insert (word, m_pCurVector);
 		}
 		else
Index: barbarisms.h
===================================================================
RCS file: /cvsroot/abi/src/other/spell/xp/barbarisms.h,v
retrieving revision 1.5
diff -u -r1.5 barbarisms.h
--- barbarisms.h	4 May 2003 17:27:33 -0000	1.5
+++ barbarisms.h	19 Mar 2004 00:29:21 -0000
@@ -35,7 +35,7 @@
 	
 	bool checkWord(const UT_UCSChar * word32, size_t length);
 	
-	bool suggestWord(const UT_UCSChar *word32, size_t length, UT_Vector* pVecsugg);
+	bool suggestWord(const UT_UCSChar *word32, size_t length, UT_GenericVector<UT_UCSChar*>* pVecsugg);
 	
 	/* 
 		Implementation of UT_XML::Listener
@@ -46,10 +46,10 @@
 
 private:
 
-	bool suggestExactWord(const UT_UCSChar *word32, size_t length,	UT_Vector* pVecsugg);			
+	bool suggestExactWord(const UT_UCSChar *word32, size_t length,	UT_GenericVector<UT_UCSChar*>* pVecsugg);			
 	
-	UT_StringPtrMap	m_map;
-	UT_Vector*		m_pCurVector;	
+	UT_GenericStringMap<UT_GenericVector<UT_UCS4Char *>*>	m_map;
+	UT_GenericVector<UT_UCS4Char *>*		m_pCurVector;	
 
 	UT_String m_sLang;
 };
Index: enchant_checker.cpp
===================================================================
RCS file: /cvsroot/abi/src/other/spell/xp/enchant_checker.cpp,v
retrieving revision 1.9
diff -u -r1.9 enchant_checker.cpp
--- enchant_checker.cpp	3 Oct 2003 02:53:24 -0000	1.9
+++ enchant_checker.cpp	19 Mar 2004 00:29:21 -0000
@@ -89,13 +89,13 @@
 	}
 }
 
-UT_Vector *
+UT_GenericVector<UT_UCSChar*>*
 EnchantChecker::_suggestWord (const UT_UCSChar *ucszWord, size_t len)
 {
 	UT_return_val_if_fail (m_dict, 0);
 	UT_return_val_if_fail (ucszWord && len, 0);
 
-	UT_Vector * pvSugg = new UT_Vector ();
+	UT_GenericVector<UT_UCSChar*> * pvSugg = new UT_GenericVector<UT_UCSChar*> ();
 
 	UT_UTF8String utf8 (ucszWord, len);
 
@@ -108,7 +108,7 @@
 		for (size_t i = 0; i < n_suggestions; i++) {
 			UT_UCSChar *ucszSugg = utf8_to_utf32(suggestions[i]);
 			if (ucszSugg)
-				pvSugg->addItem (static_cast<void *>(ucszSugg));
+				pvSugg->addItem (ucszSugg);
 		}
 
 		enchant_dict_free_suggestions (m_dict, suggestions);
Index: enchant_checker.h
===================================================================
RCS file: /cvsroot/abi/src/other/spell/xp/enchant_checker.h,v
retrieving revision 1.5
diff -u -r1.5 enchant_checker.h
--- enchant_checker.h	31 Jan 2004 16:48:38 -0000	1.5
+++ enchant_checker.h	19 Mar 2004 00:29:21 -0000
@@ -46,7 +46,7 @@
 
 	bool _requestDictionary (const char * szLang);
 	SpellChecker::SpellCheckResult _checkWord (const UT_UCSChar * word, size_t len);
-	UT_Vector * _suggestWord (const UT_UCSChar * word, size_t len);
+	UT_GenericVector<UT_UCSChar*> * _suggestWord (const UT_UCSChar * word, size_t len);
 
 	EnchantDict *m_dict;
 };
Index: ispell_checker.cpp
===================================================================
RCS file: /cvsroot/abi/src/other/spell/xp/ispell_checker.cpp,v
retrieving revision 1.86
diff -u -r1.86 ispell_checker.cpp
--- ispell_checker.cpp	31 Jan 2004 16:48:38 -0000	1.86
+++ ispell_checker.cpp	19 Mar 2004 00:29:21 -0000
@@ -169,7 +169,7 @@
 
 	for (UT_uint32 i = 0; i < size; i++)
 	{
-		UT_UCSChar * pData = static_cast<UT_UCSChar *>(pVec->getNthItem(i));
+		UT_UCSChar * pData = static_cast<UT_UCSChar *>(const_cast<void*>(pVec->getNthItem(i)));
 		DELETEPV(pData);
 	}
 
@@ -319,7 +319,7 @@
     return retVal; /* 0 - not found, 1 on found, -1 on error */
 }
 
-UT_Vector *
+UT_GenericVector<UT_UCSChar*>*
 ISpellChecker::_suggestWord(const UT_UCSChar *ucszWord, size_t length)
 {
     ichar_t  iWord[INPUTWORDLEN + MAXAFFIXLEN];
@@ -351,7 +351,7 @@
 	else
 		return NULL;
 
-	UT_Vector * sgvec = new UT_Vector();
+	UT_GenericVector<UT_UCSChar*>* sgvec = new UT_GenericVector<UT_UCSChar*>();
 
 	// Normal spell checker suggests words second
 	if (!m_bIsDictionaryWord)
@@ -390,7 +390,7 @@
 				*(reinterpret_cast<UT_UCS4Char *>(Out)) = 0;
 			}
 
-			sgvec->addItem(static_cast<void *>(ucszSugg));
+			sgvec->addItem(ucszSugg);
 		}
 	}
 
@@ -464,7 +464,7 @@
 	 */
 	for (UT_uint32 i = 0; i < m_mapping.size(); i++)
 	{
-		DictionaryMapping * mapping = static_cast<DictionaryMapping *>(m_mapping.getNthItem ( i ));
+		DictionaryMapping * mapping = static_cast<DictionaryMapping *>(const_cast<void*>(m_mapping.getNthItem ( i )));
 		if (mapping->lang.size() && !strcmp (szLang, mapping->lang.c_str()))
 		{
 			szFile = mapping->dict;
@@ -564,7 +564,7 @@
 
 	for (UT_uint32 i = 0; i < m_mapping.size(); i++)
 	{
-		DictionaryMapping * mapping = static_cast<DictionaryMapping *>(m_mapping.getNthItem ( i ));
+		DictionaryMapping * mapping = static_cast<DictionaryMapping *>(const_cast<void*>(m_mapping.getNthItem ( i )));
 		if (mapping->lang.size() && !strcmp (szLang, mapping->lang.c_str()))
 		{
 			szFile = mapping->dict;
Index: ispell_checker.h
===================================================================
RCS file: /cvsroot/abi/src/other/spell/xp/ispell_checker.h,v
retrieving revision 1.28
diff -u -r1.28 ispell_checker.h
--- ispell_checker.h	31 Jan 2004 16:48:39 -0000	1.28
+++ ispell_checker.h	19 Mar 2004 00:29:22 -0000
@@ -5,8 +5,8 @@
 #include "spell_manager.h"
 #include "ut_string_class.h"
 #include "ut_vector.h"
+#include "ut_hash.h"
 
-class UT_StringPtrMap;
 
 class ISpellChecker : public SpellChecker
 {
@@ -38,7 +38,7 @@
 
 
 	virtual SpellCheckResult	_checkWord(const UT_UCSChar* word, size_t len);
-	virtual UT_Vector*			_suggestWord(const UT_UCSChar* word, size_t len);
+	virtual UT_GenericVector<UT_UCSChar*>*	_suggestWord(const UT_UCSChar* word, size_t len);
 
 	//
 	// The member functions after this point were formerly global functions
Index: spell_manager.cpp
===================================================================
RCS file: /cvsroot/abi/src/other/spell/xp/spell_manager.cpp,v
retrieving revision 1.24
diff -u -r1.24 spell_manager.cpp
--- spell_manager.cpp	3 Oct 2003 02:53:28 -0000	1.24
+++ spell_manager.cpp	19 Mar 2004 00:29:22 -0000
@@ -78,9 +78,9 @@
 	return ret;
 }
 
-UT_Vector *SpellChecker::suggestWord(const UT_UCSChar* word, size_t len)
+UT_GenericVector<UT_UCSChar*> *SpellChecker::suggestWord(const UT_UCSChar* word, size_t len)
 {
-	UT_Vector *pvSugg = _suggestWord(word, len);
+	UT_GenericVector<UT_UCSChar*> *pvSugg = _suggestWord(word, len);
 
 	m_BarbarismChecker.suggestWord(word, len, pvSugg);
 
Index: spell_manager.h
===================================================================
RCS file: /cvsroot/abi/src/other/spell/xp/spell_manager.h,v
retrieving revision 1.18
diff -u -r1.18 spell_manager.h
--- spell_manager.h	31 Jan 2004 16:48:40 -0000	1.18
+++ spell_manager.h	19 Mar 2004 00:29:22 -0000
@@ -56,7 +56,7 @@
 	};
 
 	SpellCheckResult	checkWord(const UT_UCSChar* word, size_t len);
-	UT_Vector*			suggestWord(const UT_UCSChar* word, size_t len);
+	UT_GenericVector<UT_UCSChar*>* suggestWord(const UT_UCSChar* word, size_t len);
 
 	// vector of DictionaryMapping*
 	virtual	UT_Vector & getMapping() {return m_vecEmpty;};
@@ -108,7 +108,7 @@
 
 	virtual bool				_requestDictionary (const char * szLang) = 0;
 	virtual SpellCheckResult	_checkWord(const UT_UCSChar* word, size_t len) = 0;
-	virtual UT_Vector			*_suggestWord(const UT_UCSChar* word, size_t len) = 0;
+	virtual UT_GenericVector<UT_UCSChar*> *_suggestWord(const UT_UCSChar* word, size_t len) = 0;
 };
 
 class SpellManager