diff options
Diffstat (limited to 'bibletime/frontend/mainindex/cindexitem.cpp')
| -rw-r--r-- | bibletime/frontend/mainindex/cindexitem.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bibletime/frontend/mainindex/cindexitem.cpp b/bibletime/frontend/mainindex/cindexitem.cpp index aa50f8d..7554dc0 100644 --- a/bibletime/frontend/mainindex/cindexitem.cpp +++ b/bibletime/frontend/mainindex/cindexitem.cpp @@ -284,7 +284,7 @@ void CBookmarkItem::update() { setMultiLinesEnabled(true); setPixmap(0,SmallIcon(CResMgr::mainIndex::bookmark::icon,16)); - const TQString title = TQString::tqfromLatin1("%1 (%2)") + const TQString title = TQString::fromLatin1("%1 (%2)") .tqarg(key()) .tqarg(module() ? module()->name() : i18n("unknown")); setText(0, title); @@ -325,7 +325,7 @@ const TQString CBookmarkItem::toolTip() { Q_ASSERT(k.get()); if (fontPair.first) { //use a special font qWarning("using a font, %s", TQString(fontPair.second.family()).latin1()); - ret = TQString::tqfromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr><font face=\"%4\" size=\"4\">%5</font>") + ret = TQString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr><font face=\"%4\" size=\"4\">%5</font>") .tqarg(key()) .tqarg(module()->name()) .tqarg(description()) @@ -333,7 +333,7 @@ const TQString CBookmarkItem::toolTip() { .tqarg(k->renderedText()); } else { - ret = TQString::tqfromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr>%4") + ret = TQString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr>%4") .tqarg(key()) .tqarg(module()->name()) .tqarg(description()) @@ -652,19 +652,19 @@ void CTreeFolder::initTree() { continue; } - if (language() == TQString::tqfromLatin1("*") || (language() != TQString::tqfromLatin1("*") && TQString::tqfromLatin1((*it)->module()->Lang()) == language()) )//right type and language! + if (language() == TQString::fromLatin1("*") || (language() != TQString::fromLatin1("*") && TQString::fromLatin1((*it)->module()->Lang()) == language()) )//right type and language! usedModules.append(*it); } } //we have now all modules we want to have - if (language() == TQString::tqfromLatin1("*")) { //create subfolders for each language + if (language() == TQString::fromLatin1("*")) { //create subfolders for each language TQStringList usedLangs; // for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) { /*ListCSwordModuleInfo::iterator*/ end_it = usedModules.end(); for (ListCSwordModuleInfo::iterator it(usedModules.begin()); it != end_it; ++it) { - TQString lang = TQString::tqfromLatin1((*it)->module()->Lang()); + TQString lang = TQString::fromLatin1((*it)->module()->Lang()); // if (lang.isEmpty()) // lang = "); if (!usedLangs.contains(lang)) { @@ -1138,8 +1138,8 @@ void CGlossaryFolder::initTree() { } //found a glossary //ToDo: this is ugly code - if (language() == TQString::tqfromLatin1("*") - || (language() != TQString::tqfromLatin1("*") + if (language() == TQString::fromLatin1("*") + || (language() != TQString::fromLatin1("*") && (*it)->config(CSwordModuleInfo::GlossaryFrom) == fromLanguage() && (*it)->config(CSwordModuleInfo::GlossaryTo) == toLanguage() ) @@ -1150,7 +1150,7 @@ void CGlossaryFolder::initTree() { } //we have now all modules we want to have - if (language() == TQString::tqfromLatin1("*")) { //create subfolders for each language + if (language() == TQString::fromLatin1("*")) { //create subfolders for each language typedef std::pair<TQString, TQString> LanguagePair; typedef TQValueList<LanguagePair> LanguagePairList; |