diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 72aaee9802d447ee21340b011856b9b355a58f1a (patch) | |
tree | f97a68e4f75e6c25c8492e03fdfe6983fb0aa199 /src/kvilib/system | |
parent | 5d03948cd3558c613fae1fad109635f860babcbb (diff) | |
download | kvirc-72aaee9802d447ee21340b011856b9b355a58f1a.tar.gz kvirc-72aaee9802d447ee21340b011856b9b355a58f1a.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/kvilib/system')
-rw-r--r-- | src/kvilib/system/kvi_locale.cpp | 22 | ||||
-rw-r--r-- | src/kvilib/system/kvi_locale.h | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp index 296db7be..7bf7e348 100644 --- a/src/kvilib/system/kvi_locale.cpp +++ b/src/kvilib/system/kvi_locale.cpp @@ -609,7 +609,7 @@ bool KviMessageCatalogue::load(const TQString& name) KVI_SWAP_IF_NEEDED(bMustSwap,transDescriptor[i].length)); // In some (or all?) *.mo files the first string - // is zero bytes long and the translated one tqcontains + // is zero bytes long and the translated one contains // informations about the translation if(e->m_szKey.len() == 0) { @@ -629,7 +629,7 @@ bool KviMessageCatalogue::load(const TQString& name) // find out the text encoding , if possible if(szHeader.hasData()) { - // tqfind "charset=*\n" + // find "charset=*\n" int idx = szHeader.findFirstIdx("charset="); if(idx != -1) { @@ -658,14 +658,14 @@ bool KviMessageCatalogue::load(const TQString& name) const char * KviMessageCatalogue::translate(const char *text) { - KviTranslationEntry * aux = m_pMessages->tqfind(text); + KviTranslationEntry * aux = m_pMessages->find(text); if(aux)return aux->m_szEncodedTranslation.ptr(); return text; } const TQString & KviMessageCatalogue::translateToTQString(const char *text) { - KviTranslationEntry * aux = m_pMessages->tqfind(text); + KviTranslationEntry * aux = m_pMessages->find(text); if(aux) { if(aux->m_pTQTranslation)return *(aux->m_pTQTranslation); @@ -838,7 +838,7 @@ namespace KviLocale if(idx != -1) { // composite codec: either UTF-8 [child codec] or child codec [UTF-8] - KviSmartTextCodec * c = g_pSmartCodecDict->tqfind(szName); + KviSmartTextCodec * c = g_pSmartCodecDict->find(szName); if(c)return c; @@ -855,7 +855,7 @@ namespace KviLocale } if(c->ok()) { - g_pSmartCodecDict->tqreplace(szName,c); + g_pSmartCodecDict->replace(szName,c); return c; } else { delete c; @@ -872,7 +872,7 @@ namespace KviLocale bool loadCatalogue(const TQString &name,const TQString &szLocaleDir) { //debug("Looking up catalogue %s",name); - if(g_pCatalogueDict->tqfind(KviTQString::toUtf8(name).data()))return true; // already loaded + if(g_pCatalogueDict->find(KviTQString::toUtf8(name).data()))return true; // already loaded TQString szBuffer; @@ -1041,7 +1041,7 @@ namespace KviLocale KviMessageCatalogue * getLoadedCatalogue(const TQString& name) { - return g_pCatalogueDict->tqfind(KviTQString::toUtf8(name).data()); + return g_pCatalogueDict->find(KviTQString::toUtf8(name).data()); } @@ -1049,7 +1049,7 @@ namespace KviLocale { if(context) { - KviMessageCatalogue * c = g_pCatalogueDict->tqfind(context); + KviMessageCatalogue * c = g_pCatalogueDict->find(context); if(!c) { // FIXME: Should really try to load the catalogue here! @@ -1065,7 +1065,7 @@ namespace KviLocale { if(context) { - KviMessageCatalogue * c = g_pCatalogueDict->tqfind(context); + KviMessageCatalogue * c = g_pCatalogueDict->find(context); if(!c) { // FIXME: Should really try to load the catalogue here! @@ -1099,7 +1099,7 @@ TQString KviTranslator::translate(const char *context,const char * message,const } #endif -TQString KviTranslator::tqfind(const char *context,const char * message) const +TQString KviTranslator::find(const char *context,const char * message) const { // we ignore contexts for qt translations return g_pMainCatalogue->translateToTQString(message); diff --git a/src/kvilib/system/kvi_locale.h b/src/kvilib/system/kvi_locale.h index 27b666b7..6736a118 100644 --- a/src/kvilib/system/kvi_locale.h +++ b/src/kvilib/system/kvi_locale.h @@ -136,7 +136,7 @@ class KVILIB_API KviTranslator : public TQTranslator virtual TQString translate(const char * context,const char * message,const char * comment) const; #endif // Deprecated in qt 4.x - virtual TQString tqfind(const char * context,const char * message) const; + virtual TQString find(const char * context,const char * message) const; #ifndef COMPILE_USE_QT4 // Dead in qt 4.x virtual TQTranslatorMessage findMessage(const char * context,const char * sourceText,const char * comment = 0) const; |