decast this a bit

This commit is contained in:
Caolán McNamara
2011-09-26 22:38:26 +01:00
parent 602b63b0e4
commit 04b95fc8d0

View File

@@ -155,9 +155,7 @@ vector<Guess> SimpleGuesser::GuessLanguage(const char* text)
Guess SimpleGuesser::GuessPrimaryLanguage(const char* text) Guess SimpleGuesser::GuessPrimaryLanguage(const char* text)
{ {
vector<Guess> ret = GuessLanguage(text); vector<Guess> ret = GuessLanguage(text);
if (!ret.empty()) return ret.empty() ? Guess() : ret[0];
return ret[0];
return Guess();
} }
/** /**
* Is used to know wich language is available, unavailable or both * Is used to know wich language is available, unavailable or both
@@ -167,17 +165,18 @@ Guess SimpleGuesser::GuessPrimaryLanguage(const char* text)
*/ */
vector<Guess> SimpleGuesser::GetManagedLanguages(const char mask) vector<Guess> SimpleGuesser::GetManagedLanguages(const char mask)
{ {
size_t i;
textcat_t *tables = (textcat_t*)h; textcat_t *tables = (textcat_t*)h;
vector<Guess> lang; vector<Guess> lang;
if(!h){return lang;} if(!h){return lang;}
for (i=0; i<tables->size; i++) { for (size_t i=0; i<tables->size; ++i)
if(tables->fprint_disable[i] & mask){ {
if (tables->fprint_disable[i] & mask)
{
string langStr = "["; string langStr = "[";
langStr += (char*)fp_Name(tables->fprint[i]); langStr += fp_Name(tables->fprint[i]);
Guess g( (char *)langStr.c_str()); Guess g(langStr.c_str());
lang.push_back(g); lang.push_back(g);
} }
} }
@@ -185,49 +184,52 @@ vector<Guess> SimpleGuesser::GetManagedLanguages(const char mask)
return lang; return lang;
} }
vector<Guess> SimpleGuesser::GetAvailableLanguages(){ vector<Guess> SimpleGuesser::GetAvailableLanguages()
{
return GetManagedLanguages( sal::static_int_cast< char >( 0xF0 ) ); return GetManagedLanguages( sal::static_int_cast< char >( 0xF0 ) );
} }
vector<Guess> SimpleGuesser::GetUnavailableLanguages(){ vector<Guess> SimpleGuesser::GetUnavailableLanguages()
{
return GetManagedLanguages( sal::static_int_cast< char >( 0x0F )); return GetManagedLanguages( sal::static_int_cast< char >( 0x0F ));
} }
vector<Guess> SimpleGuesser::GetAllManagedLanguages(){ vector<Guess> SimpleGuesser::GetAllManagedLanguages()
{
return GetManagedLanguages( sal::static_int_cast< char >( 0xFF )); return GetManagedLanguages( sal::static_int_cast< char >( 0xFF ));
} }
void SimpleGuesser::XableLanguage(string lang, char mask){ void SimpleGuesser::XableLanguage(string lang, char mask)
size_t i; {
textcat_t *tables = (textcat_t*)h; textcat_t *tables = (textcat_t*)h;
if(!h){return;} if(!h){return;}
for (i=0; i<tables->size; i++) { for (size_t i=0; i<tables->size; i++)
{
string language(fp_Name(tables->fprint[i])); string language(fp_Name(tables->fprint[i]));
if(start(language,lang) == 0){ if (start(language,lang) == 0)
//cout << language << endl;
tables->fprint_disable[i] = mask; tables->fprint_disable[i] = mask;
//continue;
}
} }
} }
void SimpleGuesser::EnableLanguage(string lang){ void SimpleGuesser::EnableLanguage(string lang)
{
XableLanguage(lang, sal::static_int_cast< char >( 0xF0 )); XableLanguage(lang, sal::static_int_cast< char >( 0xF0 ));
} }
void SimpleGuesser::DisableLanguage(string lang){ void SimpleGuesser::DisableLanguage(string lang)
{
XableLanguage(lang, sal::static_int_cast< char >( 0x0F )); XableLanguage(lang, sal::static_int_cast< char >( 0x0F ));
} }
/** /**
* *
*/ */
void SimpleGuesser::SetDBPath(const char* path, const char* prefix){ void SimpleGuesser::SetDBPath(const char* path, const char* prefix)
if(h){ {
if (h)
textcat_Done(h); textcat_Done(h);
}
h = special_textcat_Init(path, prefix); h = special_textcat_Init(path, prefix);
} }