Compare commits

...

81 Commits

Author SHA1 Message Date
Slávek Banko fc125d1048
Remove cmake submodule since it has now been replaced by cmake-trinity dependency. 6 months ago
TDE Gitea e490f8050b Reset submodule main/applications/bibletime/cmake to latest HEAD 7 months ago
TDE Gitea 85595ec07b Reset submodule main/applications/bibletime/cmake to latest HEAD 9 months ago
TDE Gitea 1fa0ce3504 Reset submodule main/applications/bibletime/cmake to latest HEAD 10 months ago
TDE Gitea 5919da0f39 Reset submodule main/applications/bibletime/cmake to latest HEAD 10 months ago
TDE Gitea f46b27fe23 Reset submodule main/applications/bibletime/admin to latest HEAD 10 months ago
TDE Gitea 897382e3a5 Reset submodule main/applications/bibletime/cmake to latest HEAD 11 months ago
TDE Gitea 1d34d9734d Reset submodule main/applications/bibletime/cmake to latest HEAD 12 months ago
TDE Gitea 942fc842ef Reset submodule main/applications/bibletime/admin to latest HEAD 12 months ago
TDE Gitea fecdc21fa8 Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea 501d0dca6e Reset submodule main/applications/bibletime/admin to latest HEAD 1 year ago
TDE Gitea c51200e5a4 Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea 30dd5f6bd3 Reset submodule main/applications/bibletime/admin to latest HEAD 1 year ago
TDE Gitea c6ea66e9f2 Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea 3316890857 Reset submodule main/applications/bibletime/admin to latest HEAD 1 year ago
TDE Gitea 22328da0bf Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea 783ce187f7 Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea 590ad24aea Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea fe4b359f51 Reset submodule main/applications/bibletime/admin to latest HEAD 1 year ago
TDE Gitea 6ae933e26a Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea 6a15a5b2e3 Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea 0aab1d8459 Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea ea98243c69 Reset submodule main/applications/bibletime/cmake to latest HEAD 1 year ago
TDE Gitea fd6fdca49e Reset submodule main/applications/bibletime/admin to latest HEAD 1 year ago
TDE Gitea 1987660074 Reset submodule main/applications/bibletime/cmake to latest HEAD 2 years ago
TDE Gitea 7a04ff4ad3 Reset submodule main/applications/bibletime/cmake to latest HEAD 2 years ago
TDE Gitea e350871894 Reset submodule main/applications/bibletime/cmake to latest HEAD 2 years ago
TDE Gitea 80e9b00968 Reset submodule main/applications/bibletime/cmake to latest HEAD 2 years ago
TDE Gitea 8062ff71c1 Reset submodule main/applications/bibletime/cmake to latest HEAD 2 years ago
TDE Gitea 972116a241 Reset submodule main/applications/bibletime/cmake to latest HEAD 2 years ago
TDE Gitea a05473eda5 Reset submodule main/applications/bibletime/cmake to latest HEAD 2 years ago
TDE Gitea d44a83a4f0 Reset submodule main/applications/bibletime/cmake to latest HEAD 2 years ago
TDE Gitea 00efbf6529 Reset submodule main/applications/bibletime/cmake to latest HEAD 2 years ago
Slávek Banko 3043dc4a5f
Switch all submodules to https. 2 years ago
TDE Gitea fd9db61388 Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea 3ff04dea42 Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea c6b704c022 Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea 03d7c8dbd5 Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea 06bb61ae10 Reset submodule main/applications/bibletime/admin to latest HEAD 3 years ago
TDE Gitea cad971495d Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea dd2ccfbb24 Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea 95a51d9758 Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea dca36c7e8d Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea 9f807b2dbd Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea f96f1db1f4 Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea 609b32a35b Reset submodule main/applications/bibletime/admin to latest HEAD 3 years ago
TDE Gitea b1d4001621 Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea b8deb650dc Reset submodule main/applications/bibletime/cmake to latest HEAD 3 years ago
TDE Gitea 4f9db9c9c8 Reset submodule main/applications/bibletime/admin to latest HEAD 3 years ago
Slávek Banko 4e93524fc2 Reset submodule main/applications/bibletime/admin to latest HEAD 4 years ago
Slávek Banko 6e542f1eaf Reset submodule main/applications/bibletime/admin to latest HEAD 4 years ago
Slávek Banko 6527f1f5ab Reset submodule main/applications/bibletime/admin to latest HEAD 4 years ago
Slávek Banko b1ab94c86c Reset submodule main/applications/bibletime/cmake to latest HEAD 5 years ago
Slávek Banko 14a97ac761 Reset submodule main/applications/bibletime/admin to latest HEAD 5 years ago
Slávek Banko 869ea13f10 Reset submodule main/applications/bibletime/cmake to latest HEAD 6 years ago
Slávek Banko 45209ecfb7 Reset submodule main/applications/bibletime/admin to latest HEAD 6 years ago
Francois Andriot ce5245133b Fix FTBFS with automake >= 1.13 9 years ago
Slávek Banko 3020bf19fa Reset submodule main/applications/bibletime/admin to latest HEAD 9 years ago
Slávek Banko e8b98170a7 Reset submodule main/applications/bibletime/admin to latest HEAD 9 years ago
Francois Andriot ead6f682f5 Fix sword and clucene detection 9 years ago
Timothy Pearson 62e4bca760 Fix FTBFS with clucene 2.x 9 years ago
Timothy Pearson feb1f4e0d5 Search all library subfolders for clucene 9 years ago
Timothy Pearson a47fee7946 Fix FTBFS with older lucene versions 9 years ago
Timothy Pearson 1797f9b67c Second part of prior commit 9 years ago
Timothy Pearson cb287756a5 Fix FTBFS with CLucene v2 9 years ago
Slávek Banko d994385a4f Reset submodule main/applications/bibletime/cmake to latest HEAD 9 years ago
Slávek Banko 30bd427433 Reset submodule main/applications/bibletime/cmake to latest HEAD 9 years ago
Slávek Banko a8afc4e495 Reset submodule main/applications/bibletime/cmake to latest HEAD 9 years ago
Slávek Banko f9812d814d Reset submodule main/applications/bibletime/cmake to latest HEAD 9 years ago
Slávek Banko ff5e9c7c2f Reset submodule main/applications/bibletime/admin to latest HEAD 9 years ago
Slávek Banko bc51bd3403 Reset submodule main/applications/bibletime/cmake to latest HEAD 9 years ago
Slávek Banko 5e1e4b4938 Reset submodule main/applications/bibletime/cmake to latest HEAD 9 years ago
Slávek Banko c17073d704 Reset submodule main/applications/bibletime/admin to latest HEAD 9 years ago
Slávek Banko 2bc79be837 Update final HTML install path so all modules are consistent. 9 years ago
Darrell Anderson e9dc01f989 Update HTML install path references. 10 years ago
Darrell Anderson 2464051613 GCC 4.7 fixes. 10 years ago
Timothy Pearson 6a618a74d4 Rename a few stragglers 10 years ago
Timothy Pearson 4606f2972b Rename obsolete tq methods to standard names 10 years ago
Timothy Pearson 777119f54b Remove additional unneeded tq method conversions 10 years ago
Timothy Pearson 193ee22fa8 Rename old tq methods that no longer need a unique name 10 years ago
Slávek Banko 1a39bd7243 Add common directories 10 years ago
  1. 3
      .gitmodules
  2. 2
      INSTALL
  3. 2
      INSTALL.in
  4. 2
      acinclude.m4
  5. 1
      admin
  6. 2
      bibletime.spec
  7. 2
      bibletime.spec.in
  8. 2
      bibletime/backend/bt_osishtml.cpp
  9. 2
      bibletime/backend/bt_thmlhtml.cpp
  10. 2
      bibletime/backend/btstringmgr.h
  11. 12
      bibletime/backend/cdisplaytemplatemgr.cpp
  12. 4
      bibletime/backend/chtmlexportrendering.cpp
  13. 2
      bibletime/backend/creferencemanager.cpp
  14. 2
      bibletime/backend/cswordbackend.cpp
  15. 4
      bibletime/backend/cswordbiblemoduleinfo.cpp
  16. 12
      bibletime/backend/cswordkey.cpp
  17. 2
      bibletime/backend/cswordldkey.h
  18. 10
      bibletime/backend/cswordlexiconmoduleinfo.cpp
  19. 100
      bibletime/backend/cswordmoduleinfo.cpp
  20. 5
      bibletime/backend/cswordmoduleinfo.h
  21. 2
      bibletime/backend/cswordtreekey.h
  22. 16
      bibletime/backend/cswordversekey.cpp
  23. 10
      bibletime/backend/ctextrendering.cpp
  24. 4
      bibletime/bibletime.cpp
  25. 2
      bibletime/bibletime_dcop.cpp
  26. 16
      bibletime/bibletime_init.cpp
  27. 2
      bibletime/bibletime_slots.cpp
  28. 10
      bibletime/frontend/btinstallmgr.cpp
  29. 2
      bibletime/frontend/btinstallmgr.h
  30. 6
      bibletime/frontend/cdragdropmgr.cpp
  31. 2
      bibletime/frontend/cdragdropmgr.h
  32. 12
      bibletime/frontend/cexportmanager.cpp
  33. 48
      bibletime/frontend/cinfodisplay.cpp
  34. 2
      bibletime/frontend/cmanageindiceswidget.cpp
  35. 6
      bibletime/frontend/cmoduleindexdialog.cpp
  36. 94
      bibletime/frontend/coptionsdialog.cpp
  37. 4
      bibletime/frontend/cprinter.cpp
  38. 42
      bibletime/frontend/cprofile.cpp
  39. 6
      bibletime/frontend/cprofile.h
  40. 2
      bibletime/frontend/cprofilewindow.cpp
  41. 2
      bibletime/frontend/cprofilewindow.h
  42. 4
      bibletime/frontend/crossrefrendering.cpp
  43. 120
      bibletime/frontend/cswordsetupdialog.cpp
  44. 16
      bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
  45. 2
      bibletime/frontend/cswordsetupmodulelistview.cpp
  46. 2
      bibletime/frontend/display/cdisplay.cpp
  47. 6
      bibletime/frontend/display/chtmlreaddisplay.cpp
  48. 16
      bibletime/frontend/display/chtmlwritedisplay.cpp
  49. 2
      bibletime/frontend/display/chtmlwritedisplay.h
  50. 2
      bibletime/frontend/display/cplainwritedisplay.cpp
  51. 6
      bibletime/frontend/displaywindow/cbiblereadwindow.cpp
  52. 2
      bibletime/frontend/displaywindow/cbookreadwindow.cpp
  53. 6
      bibletime/frontend/displaywindow/cbuttons.cpp
  54. 4
      bibletime/frontend/displaywindow/cbuttons.h
  55. 2
      bibletime/frontend/displaywindow/chtmlwritewindow.cpp
  56. 2
      bibletime/frontend/displaywindow/clexiconreadwindow.cpp
  57. 2
      bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
  58. 8
      bibletime/frontend/displaywindow/cplainwritewindow.cpp
  59. 2
      bibletime/frontend/displaywindow/creadwindow.cpp
  60. 6
      bibletime/frontend/displaywindow/cwritewindow.cpp
  61. 6
      bibletime/frontend/keychooser/cbiblekeychooser.cpp
  62. 6
      bibletime/frontend/keychooser/cbooktreechooser.cpp
  63. 6
      bibletime/frontend/keychooser/ckeychooserwidget.cpp
  64. 2
      bibletime/frontend/keychooser/ckeychooserwidget.h
  65. 2
      bibletime/frontend/keychooser/clexiconkeychooser.cpp
  66. 12
      bibletime/frontend/keychooser/crefselectdialog.cpp
  67. 4
      bibletime/frontend/keychooser/cscrollerwidgetset.cpp
  68. 4
      bibletime/frontend/kstartuplogo.cpp
  69. 40
      bibletime/frontend/mainindex/cindexitem.cpp
  70. 2
      bibletime/frontend/mainindex/cmainindex.cpp
  71. 14
      bibletime/frontend/manageindicesform.cpp
  72. 4
      bibletime/frontend/manageindicesform.ui
  73. 4
      bibletime/frontend/searchdialog/cmodulechooser.cpp
  74. 4
      bibletime/frontend/searchdialog/crangechooser.cpp
  75. 34
      bibletime/frontend/searchdialog/csearchanalysis.cpp
  76. 6
      bibletime/frontend/searchdialog/csearchanalysis.h
  77. 2
      bibletime/frontend/searchdialog/csearchdialog.cpp
  78. 8
      bibletime/frontend/searchdialog/csearchdialogpages.cpp
  79. 10
      bibletime/frontend/searchdialog/csearchdialogpages.h
  80. 24
      bibletime/frontend/searchdialog/searchoptionsform.cpp
  81. 4
      bibletime/frontend/searchdialog/searchoptionsform.ui
  82. 6
      bibletime/frontend/searchdialog/searchresultsform.cpp
  83. 6
      bibletime/frontend/searchdialog/searchresultsform.ui
  84. 30
      bibletime/util/ctoolclass.cpp
  85. 22
      clucene.m4
  86. 2
      configure.in.in
  87. 4
      sword.m4

3
.gitmodules

@ -0,0 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

2
INSTALL

@ -46,7 +46,7 @@ Debian (and possibly derived distros as well) use a non-standard path to
store the documentation of KDE programs. Therefore the ./configure line above in
this case needs to be changed to:
kde_htmldir=/usr/share/doc/kde/HTML ./configure --prefix=/usr
kde_htmldir=/usr/share/doc/tde/HTML ./configure --prefix=/usr
If you forget this, you'll likely not be able to access the handbook and the
BibleStudy HowTo.

2
INSTALL.in

@ -46,7 +46,7 @@ Debian (and possibly derived distros as well) use a non-standard path to
store the documentation of KDE programs. Therefore the ./configure line above in
this case needs to be changed to:
kde_htmldir=/usr/share/doc/kde/HTML ./configure --prefix=/usr
kde_htmldir=/usr/share/doc/tde/HTML ./configure --prefix=/usr
If you forget this, you'll likely not be able to access the handbook and the
BibleStudy HowTo.

2
acinclude.m4

@ -428,7 +428,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
if test "$1" = "default"; then
if test -z "$kde_htmldir"; then
kde_htmldir='\${datadir}/doc/HTML'
kde_htmldir='\${datadir}/doc/tde/HTML'
fi
if test -z "$kde_appsdir"; then
kde_appsdir='\${datadir}/applnk'

1
admin

@ -0,0 +1 @@
Subproject commit 5bf424d9d8a3a8c3a894d6540ae164a42d2c25a5

2
bibletime.spec

@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/bin/*
%{prefix}/share/applnk/Applications/bibletime.desktop
%{prefix}/share/apps/bibletime/
%{prefix}/share/doc/HTML/en/bibletime/
%{prefix}/share/doc/tde/HTML/en/bibletime/
%{prefix}/share/icons/*
%changelog

2
bibletime.spec.in

@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/bin/*
%{prefix}/share/applnk/Applications/bibletime.desktop
%{prefix}/share/apps/bibletime/
%{prefix}/share/doc/HTML/en/bibletime/
%{prefix}/share/doc/tde/HTML/en/bibletime/
%{prefix}/share/icons/*
%changelog

2
bibletime/backend/bt_osishtml.cpp

@ -599,7 +599,7 @@ bool BT_OSISHTML::handleToken(sword::SWBuf &buf, const char *token, sword::Basic
else { // seg end tag
buf.append("</span>");
}
//qWarning(TQString("handled <seg> token. result: %1").tqarg(buf.c_str()).latin1());
//qWarning(TQString("handled <seg> token. result: %1").arg(buf.c_str()).latin1());
}
//divine name, don't use simple tag replacing because it may have attributes

2
bibletime/backend/bt_thmlhtml.cpp

@ -217,7 +217,7 @@ bool BT_ThMLHTML::handleToken(sword::SWBuf &buf, const char *token, sword::Basic
if (tag.getAttribute("lang")) {
const char* abbrev = tag.getAttribute("lang");
//const CLanguageMgr::Language* const language = CPointers::languageMgr()->languageForAbbrev( TQString::tqfromLatin1(abbrev) );
//const CLanguageMgr::Language* const language = CPointers::languageMgr()->languageForAbbrev( TQString::fromLatin1(abbrev) );
buf.append("<span class=\"foreign\" lang=\"");
buf.append(abbrev);

2
bibletime/backend/btstringmgr.h

@ -40,7 +40,7 @@ public:
protected:
/** Enable Unicode support.
* Reimplementation to show tqunicode support.
* Reimplementation to show unicode support.
*/
virtual bool supportsUnicode() const;

12
bibletime/backend/cdisplaytemplatemgr.cpp

@ -122,8 +122,8 @@ const TQString CDisplayTemplateMgr::fillTemplate( const TQString& name, const TQ
langCSS +=
TQString("\n*[lang=%1] %2")
.tqarg(lang->abbrev())
.tqarg(css);
.arg(lang->abbrev())
.arg(css);
}
}
@ -136,10 +136,10 @@ const TQString CDisplayTemplateMgr::fillTemplate( const TQString& name, const TQ
const TQFont standardFont = CBTConfig::getDefault(lang); //we just need a dummy lang param
langCSS.prepend(
TQString("\n#content {font-family:%1; font-size:%2pt; font-weight:%3; font-style: %4;}\n")
.tqarg(standardFont.family())
.tqarg(standardFont.pointSize())
.tqarg(standardFont.bold() ? "bold" : "normal")
.tqarg(standardFont.italic() ? "italic" : "normal")
.arg(standardFont.family())
.arg(standardFont.pointSize())
.arg(standardFont.bold() ? "bold" : "normal")
.arg(standardFont.italic() ? "italic" : "normal")
);
}

4
bibletime/backend/chtmlexportrendering.cpp

@ -51,7 +51,7 @@ namespace Rendering {
const ListCSwordModuleInfo& modules( tree->collectModules() );
if (modules.count() == 1) { //insert the direction into the sorrounding div
ret.insert( 5, TQString("dir=\"%1\" ").tqarg((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl" ));
ret.insert( 5, TQString("dir=\"%1\" ").arg((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl" ));
}
for ( KeyTreeItem* c = tree->first(); c; c = tree->next() ) {
@ -163,7 +163,7 @@ namespace Rendering {
entry.append("<span class=\"entryname\" dir=\"ltr\">").append(entryLink(i, *mod_Itr)).append("</span>");
if (m_settings.addText) {
//entry.append( TQString::tqfromLatin1("<span %1>%2</span>").tqarg(langAttr).tqarg(key_renderedText) );
//entry.append( TQString::fromLatin1("<span %1>%2</span>").arg(langAttr).arg(key_renderedText) );
entry.append( key_renderedText );
}

2
bibletime/backend/creferencemanager.cpp

@ -248,7 +248,7 @@ const bool CReferenceManager::decodeHyperlink( const TQString& hyperlink, TQStri
}
const TQString CReferenceManager::encodeReference(const TQString &module, const TQString &reference) {
//return TQString("(%1)%2").tqarg(module).tqarg(reference);
//return TQString("(%1)%2").arg(module).arg(reference);
return TQString("(").append(module).append(")").append(reference);
}

2
bibletime/backend/cswordbackend.cpp

@ -634,7 +634,7 @@ const TQStringList CSwordBackend::swordDirList() {
const TQString home = TQString(getenv("HOME"));
//return a list of used Sword dirs. Useful for the installer
TQString configPath = TQString("%1/.sword/sword.conf").tqarg(home);
TQString configPath = TQString("%1/.sword/sword.conf").arg(home);
if (!TQFile(configPath).exists()) {
configPath = globalConfPath; //e.g. /etc/sword.conf, /usr/local/etc/sword.conf

4
bibletime/backend/cswordbiblemoduleinfo.cpp

@ -227,7 +227,7 @@ const unsigned int CSwordBibleModuleInfo::bookNumber(const TQString &book) {
/** Returns true if his module has the text of desired type of testament */
const bool CSwordBibleModuleInfo::hasTestament( CSwordBibleModuleInfo::Testament type ) {
if (m_hasOT == -1 || m_hasNT == -1) {
const bool oldtqStatus = module()->getSkipConsecutiveLinks();
const bool oldStatus = module()->getSkipConsecutiveLinks();
module()->setSkipConsecutiveLinks(true);
*module() = sword::TOP; //position to first entry
@ -250,7 +250,7 @@ const bool CSwordBibleModuleInfo::hasTestament( CSwordBibleModuleInfo::Testament
m_hasNT = 1;
}
module()->setSkipConsecutiveLinks(oldtqStatus);
module()->setSkipConsecutiveLinks(oldStatus);
}
switch (type) {

12
bibletime/backend/cswordkey.cpp

@ -111,9 +111,9 @@ const TQString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) {
text.replace(
TQRegExp( TQString(
"(>[^<>]+)" // Avoid replacing inside tags
"\\b(0*%1)\\b").tqarg(number) ), // And span around 0's
"\\b(0*%1)\\b").arg(number) ), // And span around 0's
TQString("\\1<span lemma=\"%1%2\"><a href=\"strongs://%3/%4\">\\2</a></span>")
.tqarg(langcode, paddednumber, language, paddednumber)
.arg(langcode, paddednumber, language, paddednumber)
);
pos += rx.matchedLength();
}
@ -121,8 +121,8 @@ const TQString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) {
if (mode == HTMLEscaped) {
//we have to encode all UTF-8 in HTML escapes
// go though every character and write down the escaped HTML tqunicode entity
// form is &#<decimal tqunicode value here>;
// go though every character and write down the escaped HTML unicode entity
// form is &#<decimal unicode value here>;
TQString ret;
TQChar c;
const unsigned int length = text.length();
@ -133,9 +133,9 @@ const TQString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) {
if (c.latin1()) { //normal latin1 character
ret.append(c);
}
else {//tqunicode character, needs to be escaped
else {//unicode character, needs to be escaped
ret.append("&#")
.append(c.tqunicode())
.append(c.unicode())
.append(";");
}
}

2
bibletime/backend/cswordldkey.h

@ -36,7 +36,7 @@
* CSwordLDKey ldKey(m_module);
* ldKey.key("Adam");
* ldKey.nextEntry();
* qDebug( TQString("The current key is: %1").tqarg(ldKey.key()));
* qDebug( TQString("The current key is: %1").arg(ldKey.key()));
* @endcode
*
* Please not, that the result will be invalid if use the operator const char*

10
bibletime/backend/cswordlexiconmoduleinfo.cpp

@ -57,7 +57,7 @@ TQStringList* const CSwordLexiconModuleInfo::entries() {
}
sword::SWModule* my_module = module();
bool is_tqunicode = isUnicode();
bool is_unicode = isUnicode();
if (!m_entryList) {
m_entryList = new TQStringList();
@ -103,12 +103,12 @@ TQStringList* const CSwordLexiconModuleInfo::entries() {
int i = 0;
do {
if ( is_tqunicode ) {
if ( is_unicode ) {
m_entryList->append(TQString::fromUtf8(my_module->KeyText()));
// qWarning("Entry: %s", my_module->KeyText() );
}
else { //for latin1 modules use tqfromLatin1 because of speed
// m_entryList->append(TQString::tqfromLatin1(my_module->KeyText()));
else { //for latin1 modules use fromLatin1 because of speed
// m_entryList->append(TQString::fromLatin1(my_module->KeyText()));
TQTextCodec *codec = TQTextCodec::codecForName("CP1252");
m_entryList->append(codec->toUnicode(my_module->KeyText()));
@ -148,7 +148,7 @@ TQStringList* const CSwordLexiconModuleInfo::entries() {
if (m_entryList->count()) {
//create cache
TQString dir = KGlobal::dirs()->saveLocation("data", "bibletime/cache/");
//TQFile f2( TQString::tqfromLatin1("%1/%2").tqarg(dir).tqarg( name() ) );
//TQFile f2( TQString::fromLatin1("%1/%2").arg(dir).arg( name() ) );
TQFile f2( TQString(dir).append("/").append(name()) );

100
bibletime/backend/cswordmoduleinfo.cpp

@ -48,9 +48,11 @@
//Lucence includes
#include <CLucene.h>
#ifndef CLUCENE_V2
#include <CLucene/util/Reader.h>
#include <CLucene/util/Misc.h>
#include <CLucene/util/dirent.h>
#endif // CLUCENE_V2
//Increment this, if the index format changes
//Then indices on the user's systems will be rebuilt
@ -153,13 +155,13 @@ const bool CSwordModuleInfo::unlockKeyIsValid() {
(*m_module) = sword::TOP;
// This needs to use ::tqfromLatin1 because if the text is still locked,
// This needs to use ::fromLatin1 because if the text is still locked,
// a lot of garbage will show up. It will also work with properly decrypted
// Unicode text, because all non-ASCII Unicode chars consist of bytes >127
// and therefore contain no control (nonprintable) characters, which are all <127.
TQString test = isUnicode()
? TQString::fromUtf8(m_module->getRawEntryBuf().c_str())
: TQString::tqfromLatin1( m_module->getRawEntryBuf().c_str() );
: TQString::fromLatin1( m_module->getRawEntryBuf().c_str() );
if (test.isEmpty()) {
qWarning("Unlock key of module %s is NOT valid", name().latin1());
@ -256,7 +258,9 @@ void CSwordModuleInfo::buildIndex() {
util::scoped_ptr<lucene::index::IndexWriter> writer( new lucene::index::IndexWriter(index.ascii(), &an, true) ); //always create a new index
writer->setMaxFieldLength(BT_MAX_LUCENE_FIELD_LENGTH);
writer->setUseCompoundFile(true); //merge segments into a single file
#ifndef CLUCENE_V2
writer->setMinMergeDocs(1000);
#endif // CLUCENE_V2
*m_module = sword::TOP;
unsigned long verseLowIndex = m_module->Index();
@ -304,13 +308,23 @@ void CSwordModuleInfo::buildIndex() {
//index the key
lucene_utf8towcs(wcharBuffer, key->getText(), BT_MAX_LUCENE_FIELD_LENGTH);
#ifdef CLUCENE_V2
lucene::document::Field field1(_T("key"), wcharBuffer, lucene::document::Field::STORE_YES | lucene::document::Field::INDEX_NO);
doc->add(field1);
#else // CLUCENE_V2
doc->add(*lucene::document::Field::UnIndexed(_T("key"), wcharBuffer));
#endif // CLUCENE_V2
// index the main text
//at this point we have to make sure we disabled the strongs and the other options
//so the plain filters won't include the numbers somehow.
lucene_utf8towcs(wcharBuffer, (const char*) textBuffer.append(m_module->StripText()), BT_MAX_LUCENE_FIELD_LENGTH);
#ifdef CLUCENE_V2
lucene::document::Field field2(_T("key"), wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED);
doc->add(field2);
#else // CLUCENE_V2
doc->add(*lucene::document::Field::UnStored(_T("content"), wcharBuffer));
#endif // CLUCENE_V2
textBuffer.resize(0); //clean up
// index attributes
@ -321,7 +335,12 @@ void CSwordModuleInfo::buildIndex() {
attListI != m_module->getEntryAttributes()["Footnote"].end();
attListI++) {
lucene_utf8towcs(wcharBuffer, attListI->second["body"], BT_MAX_LUCENE_FIELD_LENGTH);
#ifdef CLUCENE_V2
lucene::document::Field field3(_T("footnote"), wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED);
doc->add(field3);
#else // CLUCENE_V2
doc->add(*lucene::document::Field::UnStored(_T("footnote"), wcharBuffer));
#endif // CLUCENE_V2
} // for attListI
// Headings
@ -329,7 +348,12 @@ void CSwordModuleInfo::buildIndex() {
attValueI != m_module->getEntryAttributes()["Heading"]["Preverse"].end();
attValueI++) {
lucene_utf8towcs(wcharBuffer, attValueI->second, BT_MAX_LUCENE_FIELD_LENGTH);
#ifdef CLUCENE_V2
lucene::document::Field field4(_T("heading"), wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED);
doc->add(field4);
#else // CLUCENE_V2
doc->add(*lucene::document::Field::UnStored(_T("heading"), wcharBuffer));
#endif // CLUCENE_V2
} // for attValueI
// Strongs/Morphs
@ -339,12 +363,22 @@ void CSwordModuleInfo::buildIndex() {
// for each attribute
if (attListI->second["LemmaClass"] == "strong") {
lucene_utf8towcs(wcharBuffer, attListI->second["Lemma"], BT_MAX_LUCENE_FIELD_LENGTH);
#ifdef CLUCENE_V2
lucene::document::Field field5(_T("strong"), wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED);
doc->add(field5);
#else // CLUCENE_V2
doc->add(*lucene::document::Field::UnStored(_T("strong"), wcharBuffer));
#endif // CLUCENE_V2
//qWarning("Adding strong %s", attListI->second["Lemma"].c_str());
}
if (attListI->second.find("Morph") != attListI->second.end()) {
lucene_utf8towcs(wcharBuffer, attListI->second["Morph"], BT_MAX_LUCENE_FIELD_LENGTH);
#ifdef CLUCENE_V2
lucene::document::Field field6(_T("morph"), wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED);
doc->add(field6);
#else // CLUCENE_V2
doc->add(*lucene::document::Field::UnStored(_T("morph"), wcharBuffer));
#endif // CLUCENE_V2
}
} // for attListI
@ -409,7 +443,11 @@ const bool CSwordModuleInfo::searchIndexed(const TQString& searchedText, sword::
lucene_utf8towcs(wcharBuffer, searchedText.utf8(), BT_MAX_LUCENE_FIELD_LENGTH);
util::scoped_ptr<lucene::search::Query> q( lucene::queryParser::QueryParser::parse(wcharBuffer, _T("content"), &analyzer) );
util::scoped_ptr<lucene::search::Hits> h( searcher.search(q, lucene::search::Sort::INDEXORDER) );
#ifdef CLUCENE_V2
util::scoped_ptr<lucene::search::Hits> h( searcher.search(q, lucene::search::Sort::INDEXORDER()) );
#else // CLUCENE_V2
util::scoped_ptr<lucene::search::Hits> h( searcher.search(q, lucene::search::Sort::INDEXORDER) );
#endif // CLUCENE_V2
const bool useScope = (scope.Count() > 0);
// const bool isVerseModule = (type() == CSwordModuleInfo::Bible) || (type() == CSwordModuleInfo::Commentary);
@ -418,7 +456,11 @@ const bool CSwordModuleInfo::searchIndexed(const TQString& searchedText, sword::
util::scoped_ptr<SWKey> swKey( module()->CreateKey() );
#ifdef CLUCENE_V2
for (unsigned int i = 0; i < h->length(); ++i) {
#else // CLUCENE_V2
for (int i = 0; i < h->length(); ++i) {
#endif // CLUCENE_V2
doc = &h->doc(i);
lucene_wcstoutf8(utfBuffer, doc->get(_T("key")), BT_MAX_LUCENE_FIELD_LENGTH);
@ -714,40 +756,40 @@ TQString CSwordModuleInfo::aboutText() const {
text += "<font size=\"-1\"><table>";
text += TQString("<tr><td><b>%1</b></td><td>%2</td><tr>")
.tqarg(i18n("Version"))
.tqarg(hasVersion()? config(CSwordModuleInfo::ModuleVersion) : i18n("unknown"));
.arg(i18n("Version"))
.arg(hasVersion()? config(CSwordModuleInfo::ModuleVersion) : i18n("unknown"));
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Markup"))
.tqarg(!TQString(m_module->getConfigEntry("SourceType")).isEmpty()? m_module->
.arg(i18n("Markup"))
.arg(!TQString(m_module->getConfigEntry("SourceType")).isEmpty()? m_module->
getConfigEntry("SourceType") : i18n("unknown").ascii());
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Location"))
.tqarg(config(CSwordModuleInfo::AbsoluteDataPath));
.arg(i18n("Location"))
.arg(config(CSwordModuleInfo::AbsoluteDataPath));
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Language"))
.tqarg(language()->translatedName());
.arg(i18n("Language"))
.arg(language()->translatedName());
if (m_module->getConfigEntry("Category"))
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Category"))
.tqarg(m_module->getConfigEntry("Category"));
.arg(i18n("Category"))
.arg(m_module->getConfigEntry("Category"));
if (m_module->getConfigEntry("LCSH"))
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("LCSH"))
.tqarg(m_module->getConfigEntry("LCSH"));
.arg(i18n("LCSH"))
.arg(m_module->getConfigEntry("LCSH"));
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Writable"))
.tqarg(isWritable()? i18n("yes") : i18n("no"));
.arg(i18n("Writable"))
.arg(isWritable()? i18n("yes") : i18n("no"));
if (isEncrypted())
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Unlock key"))
.tqarg(config(CSwordModuleInfo::CipherKey));
.arg(i18n("Unlock key"))
.arg(config(CSwordModuleInfo::CipherKey));
TQString options;
@ -756,7 +798,7 @@ TQString CSwordModuleInfo::aboutText() const {
for (opts = CSwordModuleInfo::filterTypesMIN; opts <= CSwordModuleInfo::filterTypesMAX; ++opts) {
if (has(static_cast < CSwordModuleInfo::FilterTypes > (opts))) {
if (!options.isEmpty()) {
options += TQString::tqfromLatin1(", ");
options += TQString::fromLatin1(", ");
}
options += CSwordBackend::translatedOptionName(static_cast < CSwordModuleInfo::FilterTypes > (opts));
@ -765,19 +807,19 @@ TQString CSwordModuleInfo::aboutText() const {
if (!options.isEmpty()) {
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Features"))
.tqarg(options);
.arg(i18n("Features"))
.arg(options);
}
text += "</table><hr>";
if (category() == Cult) //clearly say the module contains cult/questionable materials
text += TQString("<br/><b>%1</b><br/><br/>")
.tqarg(i18n("Take care, this work contains cult / questionable material!"));
.arg(i18n("Take care, this work contains cult / questionable material!"));
text += TQString("<b>%1:</b><br><font size=\"-1\">%2</font>")
.tqarg(i18n("About"))
.tqarg(config(AboutInformation));
.arg(i18n("About"))
.arg(config(AboutInformation));
typedef TQValueList<CSwordModuleInfo::ConfigEntry> ListConfigEntry;
@ -834,8 +876,8 @@ TQString CSwordModuleInfo::aboutText() const {
if (!t.isEmpty()) {
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(entryMap[*it])
.tqarg(config(*it));
.arg(entryMap[*it])
.arg(config(*it));
}
}
@ -871,7 +913,7 @@ const CLanguageMgr::Language * const CSwordModuleInfo::language() const {
TQString CSwordModuleInfo::getSimpleConfigEntry(const TQString& name) const {
TQString ret = isUnicode()
? TQString::fromUtf8(m_module->getConfigEntry(name.latin1()))
: TQString::tqfromLatin1(m_module->getConfigEntry(name.latin1()));
: TQString::fromLatin1(m_module->getConfigEntry(name.latin1()));
return ret.isEmpty() ? TQString() : ret;
}
@ -882,7 +924,7 @@ TQString CSwordModuleInfo::getFormattedConfigEntry(const TQString& name) const {
RTF_Filter.processText(RTF_Buffer, 0, 0);
TQString ret = isUnicode()
? TQString::fromUtf8(RTF_Buffer.c_str())
: TQString::tqfromLatin1(RTF_Buffer.c_str());
: TQString::fromLatin1(RTF_Buffer.c_str());
return ret.isEmpty() ? TQString() : ret;
}

5
bibletime/backend/cswordmoduleinfo.h

@ -27,6 +27,11 @@
#include <swversion.h>
#include <swdisp.h>
#ifdef CLUCENE_V2
// CLucene no longer lists the following functions in its headers
extern size_t lucene_utf8towcs(wchar_t *, const char *, size_t maxslen);
extern size_t lucene_wcstoutf8 (char *, const wchar_t *, size_t maxslen);
#endif // CLUCENE_V2
class CSwordBackend;

2
bibletime/backend/cswordtreekey.h

@ -45,7 +45,7 @@ public:
*/
virtual CSwordTreeKey* copy() const;
/**
* Returns the last part of the current key as tqunicode decoded TQString.
* Returns the last part of the current key as unicode decoded TQString.
* Use this instead of TreeKeyIdx::getLocalName() to avoid encoding problems.
*/
virtual const TQString getLocalNameUnicode() const;

16
bibletime/backend/cswordversekey.cpp

@ -173,19 +173,19 @@ const bool CSwordVerseKey::next( const JumpType type ) {
case UseVerse: {
if (m_module && m_module->module()) {
const bool oldtqStatus = m_module->module()->getSkipConsecutiveLinks();
const bool oldStatus = m_module->module()->getSkipConsecutiveLinks();
m_module->module()->setSkipConsecutiveLinks(true);
//disable headings for next verse
const bool useHeaders = (Verse() == 0);
const bool oldHeadingstqStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders );
const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders );
//don't use setKey(), that would create a new key without Headings set
m_module->module()->getKey()->setText( (const char*)key().utf8() );
(*(m_module->module()) )++;
((VerseKey*)(m_module->module()->getKey()))->Headings(oldHeadingstqStatus);
m_module->module()->setSkipConsecutiveLinks(oldtqStatus);
((VerseKey*)(m_module->module()->getKey()))->Headings(oldHeadingsStatus);
m_module->module()->setSkipConsecutiveLinks(oldStatus);
if (!m_module->module()->Error()) {
key( TQString::fromUtf8(m_module->module()->KeyText()) );
@ -258,16 +258,16 @@ const bool CSwordVerseKey::previous( const JumpType type ) {
case UseVerse: {
if (m_module && m_module->module()) {
const bool useHeaders = (Verse() == 0);
const bool oldHeadingstqStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders );
const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders );
m_module->module()->getKey()->setText( (const char*)key().utf8() );
const bool oldtqStatus = m_module->module()->getSkipConsecutiveLinks();
const bool oldStatus = m_module->module()->getSkipConsecutiveLinks();
m_module->module()->setSkipConsecutiveLinks(true);
( *( m_module->module() ) )--;
((VerseKey*)(m_module->module()->getKey()))->Headings( oldHeadingstqStatus );
m_module->module()->setSkipConsecutiveLinks(oldtqStatus);
((VerseKey*)(m_module->module()->getKey()))->Headings( oldHeadingsStatus );
m_module->module()->setSkipConsecutiveLinks(oldStatus);
if (!m_module->module()->Error()) {
key( TQString::fromUtf8(m_module->module()->KeyText()) );//don't use fromUtf8

10
bibletime/backend/ctextrendering.cpp

@ -141,14 +141,14 @@ m_alternativeContent( TQString() ) {
}
else if (vk.LowerBound().Chapter() != vk.UpperBound().Chapter()) {
m_alternativeContent = TQString("%1 - %2:%3")
.tqarg(TQString::fromUtf8(vk.LowerBound().getText()))
.tqarg(vk.UpperBound().Chapter())
.tqarg(vk.UpperBound().Verse());
.arg(TQString::fromUtf8(vk.LowerBound().getText()))
.arg(vk.UpperBound().Chapter())
.arg(vk.UpperBound().Verse());
}
else { //only verses differ (same book, same chapter)
m_alternativeContent = TQString("%1 - %2")
.tqarg(TQString::fromUtf8(vk.LowerBound().getText()))
.tqarg(vk.UpperBound().Verse());
.arg(TQString::fromUtf8(vk.LowerBound().getText()))
.arg(vk.UpperBound().Verse());
}
}

4
bibletime/bibletime.cpp

@ -86,7 +86,7 @@ m_mainIndex(0) {
setPlainCaption("BibleTime " VERSION);
// we don't save the tqgeometry, it's stored in the startup profile
// we don't save the geometry, it's stored in the startup profile
setAutoSaveSettings(TQString("MainWindow"), false);
}
@ -324,6 +324,6 @@ void BibleTime::polish() {
m_initialized = true;
KMainWindow::polish();
applyMainWindowSettings(CBTConfig::getConfig(), TQString::tqfromLatin1("MainWindow"));
applyMainWindowSettings(CBTConfig::getConfig(), TQString::fromLatin1("MainWindow"));
}

2
bibletime/bibletime_dcop.cpp

@ -95,7 +95,7 @@ TQStringList BibleTime::searchInModule(const TQString& moduleName, const TQStrin
mod->searchIndexed( searchText, scope );
sword::ListKey result = mod->searchResult();
const TQString lead = TQString("[%1] ").tqarg(moduleName);
const TQString lead = TQString("[%1] ").arg(moduleName);
;
for ( int i = 0; i < result.Count(); ++i ) {
sword::SWKey* key = result.getElement(i);

16
bibletime/bibletime_init.cpp

@ -580,7 +580,7 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
Q_ASSERT(p);
if (!p) return;
if (m_initialized) { //on startup KDE sets the main tqgeometry
if (m_initialized) { //on startup KDE sets the main geometry
//see polish(), where m_initialized is set and the KDE methods are called for window resize
//first Main Window state
@ -588,9 +588,9 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
toggleFullscreen(); //either showFullscreen or showNormal
if (p->maximized()) KMainWindow::showMaximized(); //if maximized, then also call showMaximized
//Then Main Window tqgeometry
KMainWindow::resize( p->tqgeometry().size() ); //Don't use KMainWindowInterface::resize
KMainWindow::move( p->tqgeometry().topLeft() );//Don't use KMainWindowInterface::move
//Then Main Window geometry
KMainWindow::resize( p->geometry().size() ); //Don't use KMainWindowInterface::resize
KMainWindow::move( p->geometry().topLeft() );//Don't use KMainWindowInterface::move
}
}
@ -602,8 +602,8 @@ void BibleTime::storeProfileSettings( CProfile* p ) {
p->setFullscreen( m_windowFullscreen_action->isChecked() );
p->setMaximized( this->KMainWindow::isMaximized() );
TQRect tqgeometry;
tqgeometry.setTopLeft(pos());
tqgeometry.setSize(size());
p->setGeometry(tqgeometry);
TQRect geometry;
geometry.setTopLeft(pos());
geometry.setSize(size());
p->setGeometry(geometry);
}

2
bibletime/bibletime_slots.cpp

@ -324,7 +324,7 @@ void BibleTime::slotToggleToolbar() {
/** Shows or hides the groupmanager.
*/
void BibleTime::slotToggleMainIndex() {
//we use the parent widget because the main index is enclosed in a tqlayout which adds the label at the top
//we use the parent widget because the main index is enclosed in a layout which adds the label at the top
if (m_viewMainIndex_action->isChecked()) {
m_mainIndex->parentWidget()->show();
}

10
bibletime/frontend/btinstallmgr.cpp

@ -41,7 +41,7 @@ namespace BookshelfManager {
const TQString BTInstallMgr::Tool::LocalConfig::swordConfigFilename() {
// Q_ASSERT( CPointers::backend()->sysconfig );
return TQString::tqfromLatin1("%1/.sword/sword.conf").tqarg(getenv("HOME"));
return TQString::fromLatin1("%1/.sword/sword.conf").arg(getenv("HOME"));
}
TQStringList BTInstallMgr::Tool::RemoteConfig::sourceList( sword::InstallMgr* mgr ) {
@ -65,7 +65,7 @@ namespace BookshelfManager {
while (sourceBegin != sourceEnd) {
InstallSource is("DIR", sourceBegin->second.c_str());
names << TQString::tqfromLatin1(is.caption.c_str());
names << TQString::fromLatin1(is.caption.c_str());
sourceBegin++;
}
@ -102,7 +102,7 @@ namespace BookshelfManager {
for (TQStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
TQString t = *it;
if (t.contains( TQString("%1/.sword").tqarg(getenv("HOME")) )) {
if (t.contains( TQString("%1/.sword").arg(getenv("HOME")) )) {
//we don't want HOME/.sword in the config
continue;
}
@ -117,7 +117,7 @@ namespace BookshelfManager {
if (!directAccess) { //use kdesu to move the file to the right place
KProcess *proc = new KProcess;
*proc << "kdesu";
*proc << TQString::tqfromLatin1("-c") << TQString("mv %1 %2").tqarg(filename).tqarg(LocalConfig::swordConfigFilename());
*proc << TQString::fromLatin1("-c") << TQString("mv %1 %2").arg(filename).arg(LocalConfig::swordConfigFilename());
proc->start(KProcess::Block);
}
}
@ -326,7 +326,7 @@ namespace BookshelfManager {
emit completed(totalPercent, filePercent);
}
void BTInstallMgr::pretqStatus(long totalBytes, long completedBytes, const char* /*message*/) {
void BTInstallMgr::preStatus(long totalBytes, long completedBytes, const char* /*message*/) {
qWarning("pre Status: %i / %i", (int)totalBytes, (int)completedBytes);
emit downloadStarted( "unknown filename" );

2
bibletime/frontend/btinstallmgr.h

@ -94,7 +94,7 @@ public:
protected:
/* Reimplementations of method in StatusReporter */
virtual void statusUpdate(double dltotal, double dlnow);
virtual void pretqStatus(long totalBytes, long completedBytes, const char *message);
virtual void preStatus(long totalBytes, long completedBytes, const char *message);
// virtual FTPTransport *createFTPTransport(const char *host, StatusReporter *statusReporter);

6
bibletime/frontend/cdragdropmgr.cpp

@ -48,7 +48,7 @@ const char* CDragDropMgr::BTDrag::format( int i ) const {
bool CDragDropMgr::BTDrag::decode(const TQMimeSource* e, TQString& str) {
if (canDecode(e)) {
str = TQString( e->tqencodedData( "BibleTime/DND" ) );
str = TQString( e->encodedData( "BibleTime/DND" ) );
return true;
}
return false;
@ -58,8 +58,8 @@ bool CDragDropMgr::BTDrag::decode(const TQMimeSource* e, TQString& str, TQCStrin
return decode(e, str);
};
TQByteArray CDragDropMgr::BTDrag::tqencodedData( const char* /*type*/ ) const {
return TQTextDrag::tqencodedData("text/plain"); //hack because TQTextDrag only accepts text/plainand not our BibleTime/DND type
TQByteArray CDragDropMgr::BTDrag::encodedData( const char* /*type*/ ) const {
return TQTextDrag::encodedData("text/plain"); //hack because TQTextDrag only accepts text/plainand not our BibleTime/DND type
};
///////////////////////////// new class //////////////////////

2
bibletime/frontend/cdragdropmgr.h

@ -135,7 +135,7 @@ public:
virtual bool provides( const char* type ) const;
virtual const char* format( int i = 0 ) const;
virtual TQByteArray tqencodedData( const char* type ) const;
virtual TQByteArray encodedData( const char* type ) const;
protected:
friend class CDragDropMgr;

12
bibletime/frontend/cexportmanager.cpp

@ -44,7 +44,7 @@ using namespace Rendering;
using namespace Printing;
CExportManager::CExportManager(const TQString& caption, const bool showProgress, const TQString& progressLabel, const CSwordBackend::FilterOptions filterOptions, const CSwordBackend::DisplayOptions displayOptions) {
m_caption = !caption.isEmpty() ? caption : TQString::tqfromLatin1("BibleTime");
m_caption = !caption.isEmpty() ? caption : TQString::fromLatin1("BibleTime");
m_progressLabel = progressLabel;
m_filterOptions = filterOptions;
m_displayOptions = displayOptions;
@ -237,7 +237,7 @@ const bool CExportManager::copyKey(CSwordKey* key, const Format format, const bo
text = render->renderSingleKey(key->key(), modules);
}
KApplication::tqclipboard()->setText(text);
KApplication::clipboard()->setText(text);
return true;
};
@ -272,7 +272,7 @@ const bool CExportManager::copyKeyList(sword::ListKey* list, CSwordModuleInfo* m
}
const TQString text = render->renderKeyTree(tree);
KApplication::tqclipboard()->setText(text);
KApplication::clipboard()->setText(text);
return true;
};
@ -306,7 +306,7 @@ const bool CExportManager::copyKeyList(TQPtrList<CSwordKey>& list, const Format
};
const TQString text = render->renderKeyTree(tree);
KApplication::tqclipboard()->setText(text);
KApplication::clipboard()->setText(text);
return true;
};
@ -485,7 +485,7 @@ const TQString CExportManager::getSaveFileName(const Format format) {
/** Returns a string containing the linebreak for the current format. */
const TQString CExportManager::lineBreak(const Format format) {
if (static_cast<bool>(m_displayOptions.lineBreaks))
return (format == HTML) ? TQString::tqfromLatin1("<br/>\n") : TQString::tqfromLatin1("\n");
return (format == HTML) ? TQString::fromLatin1("<br/>\n") : TQString::fromLatin1("\n");
return TQString();
}
@ -497,7 +497,7 @@ void CExportManager::setProgressRange( const int items ) {
dlg->setProgress(0);
dlg->setMinimumDuration(0);
dlg->show();
// dlg->tqrepaint();
// dlg->repaint();
KApplication::kApplication()->processEvents(); //do not lock the GUI!
}
}

48
bibletime/frontend/cinfodisplay.cpp

@ -49,7 +49,7 @@ namespace InfoDisplay {
CInfoDisplay::CInfoDisplay(TQWidget *parent, const char *name)
: TQWidget(parent, name) {
TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
TQVBoxLayout* layout = new TQVBoxLayout(this);
TQLabel* headingLabel = new TQLabel(i18n("Mag (\"shift\" to lock)"),this);
headingLabel->setMargin(5);
@ -63,8 +63,8 @@ namespace InfoDisplay {
TQT_SLOT(lookup(const TQString&, const TQString&))
);
tqlayout->addWidget(headingLabel);
tqlayout->addWidget(m_htmlPart->view());
layout->addWidget(headingLabel);
layout->addWidget(m_htmlPart->view());
}
@ -165,9 +165,9 @@ namespace InfoDisplay {
ret.append(
TQString("<div class=\"abbreviation\"><h3>%1: %2</h3><p>%3</p></div>")
.tqarg(i18n("Abbreviation"))
.tqarg("text")
.tqarg(text));
.arg(i18n("Abbreviation"))
.arg("text")
.arg(text));
return ret;
}
@ -176,7 +176,7 @@ namespace InfoDisplay {
Q_ASSERT(!data.isEmpty());
if (data.isEmpty()) {
return TQString("<div class=\"crossrefinfo\"><h3>%1</h3></div>")
.tqarg(i18n("Cross references"));
.arg(i18n("Cross references"));
}
// qWarning("setting crossref %s", data.latin1());
@ -229,8 +229,8 @@ namespace InfoDisplay {
VerseKey vk;
sword::ListKey refs = vk.ParseVerseList((const char*)data.mid((pos == -1) ? 0 : pos+1).utf8(), "Gen 1:1", true);
for (int i = 0; i < refs.Count(); ++i) {
SWKey* key = refs.getElement(i);
for (int j = 0; j < refs.Count(); ++j) {
SWKey* key = refs.getElement(j);
Q_ASSERT(key);
VerseKey* vk = dynamic_cast<VerseKey*>(key);
@ -269,9 +269,9 @@ namespace InfoDisplay {
// qWarning("rendered the tree: %s", renderer.renderKeyTree(tree).latin1());
//spanns containing rtl text need dir=rtl on their parent tag to be aligned properly
return TQString("<div class=\"crossrefinfo\"><h3>%1</h3><div class=\"para\" dir=\"%2\">%3</div></div>")
.tqarg(i18n("Cross references"))
.tqarg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "")
.tqarg(renderer.renderKeyTree(tree));
.arg(i18n("Cross references"))
.arg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "")
.arg(renderer.renderKeyTree(tree));
}
/*!
@ -310,8 +310,8 @@ namespace InfoDisplay {
));
return TQString("<div class=\"footnoteinfo\"><h3>%1</h3><p>%2</p></div>")
.tqarg(i18n("Footnote"))
.tqarg(text);
.arg(i18n("Footnote"))
.arg(text);
}
const TQString CInfoDisplay::decodeStrongs( const TQString& data ) {
@ -337,9 +337,9 @@ namespace InfoDisplay {
ret.append(
TQString("<div class=\"strongsinfo\"><h3>%1: %2</h3><p>%3</p></div>")
.tqarg(i18n("Strongs"))
.tqarg(*it)
.tqarg(text)
.arg(i18n("Strongs"))
.arg(*it)
.arg(text)
);
}
@ -372,7 +372,7 @@ namespace InfoDisplay {
// No need to check len, if at(1) is > len TQChar::null is
// returned which is ok to .isDigit()
if (value.at(1).isDigit()) {
switch (value.tqat(0).latin1()) {
switch (value.at(0).latin1()) {
case 'G':
module = CBTConfig::get
(CBTConfig::standardGreekMorphLexicon);
@ -416,9 +416,9 @@ namespace InfoDisplay {
//if the module wasn't found just display an empty morph info
ret.append( TQString("<div class=\"morphinfo\"><h3>%1: %2</h3><p>%3</p></div>")
.tqarg(i18n("Morphology"))
.tqarg(value)
.tqarg(text)
.arg(i18n("Morphology"))
.arg(value)
.arg(text)
);
}
@ -439,9 +439,9 @@ namespace InfoDisplay {
}
TQString ret = TQString("<div class=\"translationinfo\"><h3>%1: %2</h3><p>%3</p></div>")
.tqarg(i18n("Word lookup"))
.tqarg(data)
.tqarg(key->renderedText());
.arg(i18n("Word lookup"))
.arg(data)
.arg(key->renderedText());
return ret;
}

2
bibletime/frontend/cmanageindiceswidget.cpp

@ -103,7 +103,7 @@ void CManageIndicesWidget::populateModuleList() {
if ((*it)->hasIndex()) {
item = new TQCheckListItem(m_modsWithIndices, (*it)->name(),
TQCheckListItem::CheckBox);
item->setText(1, TQString("%1 ").tqarg((*it)->indexSize() / 1024) + i18n("KiB"));
item->setText(1, TQString("%1 ").arg((*it)->indexSize() / 1024) + i18n("KiB"));
}
else {
item = new TQCheckListItem(m_modsWithoutIndices, (*it)->name(),

6
bibletime/frontend/cmoduleindexdialog.cpp

@ -50,7 +50,7 @@ void CModuleIndexDialog::indexAllModules( const ListCSwordModuleInfo& modules )
(*it)->connectIndexingFinished(this, TQT_SLOT(slotFinished()));
(*it)->connectIndexingProgress(this, TQT_SLOT(slotModuleProgress(int)));
progress->setLabel(i18n("Creating index for work %1").tqarg((*it)->name()));
progress->setLabel(i18n("Creating index for work %1").arg((*it)->name()));
qDebug("Building index for work %s", (*it)->name().latin1());