Reset submodule main/applications/misc/bibletime/admin to latest HEAD

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

.gitmodules

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

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.

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.

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'

admin

@@ -0,0 +1 @@
+Subproject commit 92a6d62b8f8f1836c43b54e3fb13b7ea7bb22e9f

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

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

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

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);

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;
 

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")
 		);
 	}
 

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 );
 			}
 

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);
 }
 

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

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) {

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(";");
 				}
 			}

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*

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()) );
 
 

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;
 }

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;
 

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;

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

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());
 		}
 	}
 

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"));
 }
 

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);

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);
 }

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();
 	}

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" );
 

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);
 

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 //////////////////////

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;

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!
 	}
 }

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;
 	}

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(),

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());
 		
 		(*it)->buildIndex();
@@ -87,12 +87,12 @@ void CModuleIndexDialog::slotModuleProgress( int percentage ) {
 //	qDebug("progress %d", percentage);
 	
 	progress->progressBar()->setProgress( m_currentModuleIndex * 100 + percentage );
-	KApplication::kApplication()->tqprocessEvents( 10 ); //10 ms only
+	KApplication::kApplication()->processEvents( 10 ); //10 ms only
 }
 
 void CModuleIndexDialog::slotFinished( ) {
 	qDebug("indexing finished()");
 	
 	progress->progressBar()->setProgress( progress->progressBar()->totalSteps() );
-	KApplication::kApplication()->tqprocessEvents( 1 ); //1 ms only
+	KApplication::kApplication()->processEvents( 1 ); //1 ms only
 }

bibletime/frontend/coptionsdialog.cpp

@@ -136,8 +136,8 @@ const bool COptionsDialog::showPart( COptionsDialog::Parts /*ID*/ ) {
 /** Initializes the startup section of the OD. */
 void COptionsDialog::initDisplay() {
 	TQFrame* page = addPage(i18n("Display"), TQString(), DesktopIcon(CResMgr::settings::startup::icon,32));
-	TQVBoxLayout* tqlayout = new TQVBoxLayout(page);
-	tqlayout->setSpacing( 5 );
+	TQVBoxLayout* layout = new TQVBoxLayout(page);
+	layout->setSpacing( 5 );
 
 	{//daily tips
 		m_settings.startup.showTips = new TQCheckBox(page);
@@ -149,8 +149,8 @@ void COptionsDialog::initDisplay() {
 		m_settings.startup.showTips->setChecked( CBTConfig::get
 					(CBTConfig::tips) );
 	}
-	tqlayout->addWidget(m_settings.startup.showTips);
-	tqlayout->addSpacing(5);
+	layout->addWidget(m_settings.startup.showTips);
+	layout->addSpacing(5);
 
 	{ //startup logo
 		m_settings.startup.showLogo = new TQCheckBox(page);
@@ -161,39 +161,39 @@ void COptionsDialog::initDisplay() {
 
 		m_settings.startup.showLogo->setChecked(CBTConfig::get
 													(CBTConfig::logo));
-		tqlayout->addWidget(m_settings.startup.showLogo);
-		tqlayout->addSpacing(20);
+		layout->addWidget(m_settings.startup.showLogo);
+		layout->addSpacing(20);
 	}
 
-	tqlayout->addWidget(
+	layout->addWidget(
 		CToolClass::explanationLabel(page, i18n("Display templates"),
 									 i18n("Display templates define how text is displayed. Please choose a template you like.")
 									)
 	);
 
-	tqlayout->addSpacing( 5 );
+	layout->addSpacing( 5 );
 
-	TQHBoxLayout* hboxtqlayout = new TQHBoxLayout();
+	TQHBoxLayout* hboxlayout = new TQHBoxLayout();
 
 	m_settings.displayStyle.styleChooser = new TQComboBox( page ); //create first to enable buddy for label
 	connect( m_settings.displayStyle.styleChooser, TQT_SIGNAL( activated( int ) ),
 			 this, TQT_SLOT( updateStylePreview() ) );
 
-	hboxtqlayout->addWidget(
+	hboxlayout->addWidget(
 		new TQLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page)
 	);
-	hboxtqlayout->addWidget( m_settings.displayStyle.styleChooser );
-	hboxtqlayout->addStretch();
-	tqlayout->addLayout( hboxtqlayout );
+	hboxlayout->addWidget( m_settings.displayStyle.styleChooser );
+	hboxlayout->addStretch();
+	layout->addLayout( hboxlayout );
 
 	m_settings.displayStyle.stylePreview = new KHTMLPart(page);
-	tqlayout->addWidget(
+	layout->addWidget(
 		new TQLabel(
 			m_settings.displayStyle.stylePreview->view(),
 			i18n("Style preview"), page
 		)
 	);
-	tqlayout->addWidget(m_settings.displayStyle.stylePreview->view());
+	layout->addWidget(m_settings.displayStyle.stylePreview->view());
 
 	m_settings.displayStyle.styleChooser->insertStringList(
 		CPointers::displayTemplateManager()->availableTemplates()
@@ -212,11 +212,11 @@ void COptionsDialog::initDisplay() {
 /** Init fonts section. */
 void COptionsDialog::initLanguages() {
 	TQFrame* page = addPage(i18n("Languages"), TQString(), DesktopIcon(CResMgr::settings::fonts::icon, 32));
-	TQVBoxLayout* tqlayout = new TQVBoxLayout(page,5);
-	tqlayout->setResizeMode( TQLayout::Minimum );
+	TQVBoxLayout* layout = new TQVBoxLayout(page,5);
+	layout->setResizeMode( TQLayout::Minimum );
 
 	{ //Sword locales
-		tqlayout->addWidget(
+		layout->addWidget(
 			CToolClass::explanationLabel(page, i18n("Specify a language for names of Bible books"),
 										 i18n("Sword has a number of locales available which can be used to internationalize the \
   names of books of the Bible. You can specify which locale to use. If you want to \
@@ -233,7 +233,7 @@ void COptionsDialog::initLanguages() {
 		hBoxLayout->addWidget(label);
 		hBoxLayout->addWidget(m_settings.fonts.swordLocaleCombo);
 		hBoxLayout->addStretch();
-		tqlayout->addLayout(hBoxLayout);
+		layout->addLayout(hBoxLayout);
 
 		TQStringList languageNames;
 		languageNames.append( languageMgr()->languageForAbbrev("en_US")->translatedName() );
@@ -276,7 +276,7 @@ void COptionsDialog::initLanguages() {
 											  (CBTConfig::language).local8Bit()
 										  );
 			if (locale) {
-				currentLanguageName = TQString::tqfromLatin1(locale->getDescription());
+				currentLanguageName = TQString::fromLatin1(locale->getDescription());
 			}
 		}
 
@@ -294,10 +294,10 @@ void COptionsDialog::initLanguages() {
 			}
 		}
 
-		tqlayout->addSpacing( 20 );
+		layout->addSpacing( 20 );
 	}
 	{ //Font settings
-		tqlayout->addWidget(
+		layout->addWidget(
 			CToolClass::explanationLabel(
 				page,
 				i18n("Select custom fonts per-language"),
@@ -306,7 +306,7 @@ void COptionsDialog::initLanguages() {
  to be displayed correctly.")
 			)
 		);
-		tqlayout->addSpacing(5);
+		layout->addSpacing(5);
 		TQHBoxLayout* hLayout = new TQHBoxLayout();
 
 		m_settings.fonts.usage = new TQComboBox(page);
@@ -338,12 +338,12 @@ void COptionsDialog::initLanguages() {
 		connect(m_settings.fonts.useOwnFontBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(useOwnFontClicked(bool)));
 		hLayout->addWidget(m_settings.fonts.useOwnFontBox);
 
-		tqlayout->addLayout(hLayout);
+		layout->addLayout(hLayout);
 		//#warning TODO: remember the last selected font and jump there.
 
 		m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, TQStringList(), true, 5);
 		m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog."));
-		tqlayout->addWidget(m_settings.fonts.fontChooser);
+		layout->addWidget(m_settings.fonts.fontChooser);
 
 		connect(m_settings.fonts.fontChooser, TQT_SIGNAL(fontSelected(const TQFont&)), TQT_SLOT(newDisplayWindowFontSelected(const TQFont&)));
 		connect(m_settings.fonts.usage, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(newDisplayWindowFontAreaSelected(const TQString&)));
@@ -351,7 +351,7 @@ void COptionsDialog::initLanguages() {
 		m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].second );
 		useOwnFontClicked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first );
 		m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first );
-		m_settings.fonts.fontChooser->setMinimumSize(m_settings.fonts.fontChooser->tqsizeHint());
+		m_settings.fonts.fontChooser->setMinimumSize(m_settings.fonts.fontChooser->sizeHint());
 	}
 }
 
@@ -658,71 +658,71 @@ void COptionsDialog::initSword() {
 	{ // ---------- new tab: filters -------- //
 		TQFrame* currentTab = new TQFrame(tabCtl);
 		tabCtl->addTab(currentTab, i18n("Text filters"));
-		TQVBoxLayout* tqlayout = new TQVBoxLayout(currentTab,5);
+		TQVBoxLayout* layout = new TQVBoxLayout(currentTab,5);
 
-		tqlayout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Text filters"),
+		layout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Text filters"),
 						   i18n("Filters control the appearance of text. \
 Here you can specify default settings for all filters. \
 You can change the filter settings in each display window, of course.")) );
 
-		tqlayout->addSpacing(5);
+		layout->addSpacing(5);
 
 		m_settings.swords.lineBreaks = new TQCheckBox(currentTab);
 		m_settings.swords.lineBreaks->setText(i18n("Insert line break after each verse"));
 		m_settings.swords.lineBreaks->setChecked(CBTConfig::get
 					(CBTConfig::lineBreaks));
-		tqlayout->addWidget(m_settings.swords.lineBreaks);
+		layout->addWidget(m_settings.swords.lineBreaks);
 
 		m_settings.swords.verseNumbers = new TQCheckBox(currentTab);
 		m_settings.swords.verseNumbers->setText(i18n("Show verse numbers"));
 		m_settings.swords.verseNumbers->setChecked(CBTConfig::get
 					(CBTConfig::verseNumbers));
-		tqlayout->addWidget(m_settings.swords.verseNumbers);
+		layout->addWidget(m_settings.swords.verseNumbers);
 
 		m_settings.swords.headings = new TQCheckBox(currentTab);
 		m_settings.swords.headings->setText(i18n("Show section headings"));
 		m_settings.swords.headings->setChecked(CBTConfig::get
 												   (CBTConfig::headings));
-		tqlayout->addWidget(m_settings.swords.headings);
+		layout->addWidget(m_settings.swords.headings);
 
 
 		m_settings.swords.scriptureReferences = new TQCheckBox(currentTab);
 		m_settings.swords.scriptureReferences->setText(i18n("Show scripture cross-references"));
 		m_settings.swords.scriptureReferences->setChecked(CBTConfig::get
 					(CBTConfig::scriptureReferences));
-		tqlayout->addWidget(m_settings.swords.scriptureReferences);
+		layout->addWidget(m_settings.swords.scriptureReferences);
 
 		m_settings.swords.greekAccents = new TQCheckBox(currentTab);
 		m_settings.swords.greekAccents->setText(i18n("Show Greek accents"));
 		m_settings.swords.greekAccents->setChecked(CBTConfig::get
 					(CBTConfig::greekAccents));
-		tqlayout->addWidget(m_settings.swords.greekAccents);
+		layout->addWidget(m_settings.swords.greekAccents);
 
 		m_settings.swords.hebrewPoints = new TQCheckBox(currentTab);
 		m_settings.swords.hebrewPoints->setText(i18n("Show Hebrew vowel points"));
 		m_settings.swords.hebrewPoints->setChecked(CBTConfig::get
 					(CBTConfig::hebrewPoints));
-		tqlayout->addWidget(m_settings.swords.hebrewPoints);
+		layout->addWidget(m_settings.swords.hebrewPoints);
 
 		m_settings.swords.hebrewCantillation = new TQCheckBox(currentTab);
 		m_settings.swords.hebrewCantillation->setText(i18n("Show Hebrew cantillation marks"));
 		m_settings.swords.hebrewCantillation->setChecked(CBTConfig::get
 					(CBTConfig::hebrewCantillation));
-		tqlayout->addWidget(m_settings.swords.hebrewCantillation);
+		layout->addWidget(m_settings.swords.hebrewCantillation);
 
 		m_settings.swords.morphSegmentation = new TQCheckBox(currentTab);
 		m_settings.swords.morphSegmentation->setText(i18n("Show morph segmentation"));
 		m_settings.swords.morphSegmentation->setChecked(CBTConfig::get
 					(CBTConfig::morphSegmentation));
-		tqlayout->addWidget(m_settings.swords.morphSegmentation);
+		layout->addWidget(m_settings.swords.morphSegmentation);
 
 		m_settings.swords.textualVariants = new TQCheckBox(currentTab);
 		m_settings.swords.textualVariants->setText(i18n("Use textual variants"));
 		m_settings.swords.textualVariants->setChecked(CBTConfig::get
 					(CBTConfig::textualVariants));
-		tqlayout->addWidget(m_settings.swords.textualVariants);
+		layout->addWidget(m_settings.swords.textualVariants);
 
-		tqlayout->addStretch(4);
+		layout->addStretch(4);
 	}
 }
 
@@ -853,8 +853,8 @@ void COptionsDialog::saveSword() {
 			SWLocale* locale = LocaleMgr::getSystemLocaleMgr()->getLocale((*it).c_str());
 			Q_ASSERT(locale);
 
-			if ( locale && (TQString::tqfromLatin1(locale->getDescription()) == currentLanguageName) ) {
-				languageAbbrev = TQString::tqfromLatin1(locale->getName()); //we found the abbrevation for the current language
+			if ( locale && (TQString::fromLatin1(locale->getDescription()) == currentLanguageName) ) {
+				languageAbbrev = TQString::fromLatin1(locale->getName()); //we found the abbrevation for the current language
 				break;
 			}
 		}
@@ -922,36 +922,36 @@ void COptionsDialog::updateStylePreview() {
 
 	tree.append( new CTextRendering::KeyTreeItem(
 					 TQString("\n<span class=\"entryname\"><a name=\"John316\" href=\"sword://Bible/WEB/John 3:16\">16</a></span>%1")
-					 .tqarg(i18n("For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.")),
+					 .arg(i18n("For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.")),
 					 settings));
 
 	tree.append( new CTextRendering::KeyTreeItem(
 					 TQString("\n<span class=\"entryname\"><a name=\"John317\" href=\"sword://Bible/WEB/John 3:17\">17</a></span>%1")
-					 .tqarg(i18n("For God didn't send his Son into the world to judge the world, but that the world should be saved through him.")),
+					 .arg(i18n("For God didn't send his Son into the world to judge the world, but that the world should be saved through him.")),
 					 settings));
 
 	settings.highlight = true;
 
 	tree.append( new CTextRendering::KeyTreeItem(
 					 TQString("\n<span class=\"entryname\"><a name=\"John318\" href=\"sword://Bible/WEB/John 3:18\">18</a></span>%1")
-					 .tqarg(i18n("He who believes in him is not judged. He who doesn't believe has been judged already, because he has not believed in the name of the one and only Son of God.")),
+					 .arg(i18n("He who believes in him is not judged. He who doesn't believe has been judged already, because he has not believed in the name of the one and only Son of God.")),
 					 settings) );
 
 	settings.highlight = false;
 
 	tree.append( new CTextRendering::KeyTreeItem(
 					 TQString("\n<span class=\"entryname\"><a name=\"John319\" href=\"sword://Bible/WEB/John 3:19\">19</a></span>%1")
-					 .tqarg(i18n("This is the judgment, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.")),
+					 .arg(i18n("This is the judgment, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.")),
 					 settings));
 
 	tree.append( new CTextRendering::KeyTreeItem(
 					 TQString("\n<span class=\"entryname\"><a name=\"John320\" href=\"sword://Bible/WEB/John 3:20\">20</a></span>%1<br/>")
-					 .tqarg(i18n("For everyone who does evil hates the light, and doesn't come to the light, lest his works would be exposed.")),
+					 .arg(i18n("For everyone who does evil hates the light, and doesn't come to the light, lest his works would be exposed.")),
 					 settings));
 
 	tree.append( new CTextRendering::KeyTreeItem(
 					 TQString("\n<span class=\"entryname\"><a name=\"John321\" href=\"sword://Bible/WEB/John 3:21\">21</a></span>%1")
-					 .tqarg(i18n("But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.")),
+					 .arg(i18n("But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.")),
 					 settings));
 
 	const TQString oldStyleName = CBTConfig::get

bibletime/frontend/cprinter.cpp

@@ -53,7 +53,7 @@ namespace Printing {
 		m_htmlPart->write(renderKeyTree(tree));
 		m_htmlPart->end();
 
-		m_htmlPart->view()->tqlayout();
+		m_htmlPart->view()->layout();
 		m_htmlPart->view()->print();
 	}
 
@@ -89,7 +89,7 @@ namespace Printing {
 		Q_ASSERT(printItem);
 
 		if (printItem && printItem->hasAlternativeContent()) {
-			TQString ret = TQString::tqfromLatin1("<div class=\"entry\"><div class=\"rangeheading\">%1</div>").tqarg(printItem->getAlternativeContent());
+			TQString ret = TQString::fromLatin1("<div class=\"entry\"><div class=\"rangeheading\">%1</div>").arg(printItem->getAlternativeContent());
 
 			if (i.hasChildItems()) {
 				KeyTree const * tree = i.childList();

bibletime/frontend/cprofile.cpp

@@ -30,7 +30,7 @@ CProfile::CProfile( const TQString& file, const TQString& name ):
 m_name(name.isEmpty() ? i18n("unknown") : name),
 m_filename(file),
 m_fullscreen(false),
-m_tqgeometry(10,20,640,480) {
+m_geometry(10,20,640,480) {
 
 	m_profileWindows.setAutoDelete(true);
 	if (!m_filename.isEmpty() && name.isEmpty()) {
@@ -216,14 +216,14 @@ const bool CProfile::save(TQPtrList<CProfileWindow> windows) {
 		TQDomElement mainWindow = doc.createElement("MAINWINDOW");
 		mainWindow.setAttribute("fullscreen", fullscreen());
 
-		TQDomElement tqgeometry = doc.createElement("GEOMETRY");
-		mainWindow.appendChild(tqgeometry);
-		const TQRect r = this->tqgeometry();
-		tqgeometry.setAttribute("x",r.x());
-		tqgeometry.setAttribute("y",r.y());
-		tqgeometry.setAttribute("width",r.width());
-		tqgeometry.setAttribute("height",r.height());
-		tqgeometry.setAttribute("isMaximized",static_cast<int>(this->maximized()));
+		TQDomElement geometry = doc.createElement("GEOMETRY");
+		mainWindow.appendChild(geometry);
+		const TQRect r = this->geometry();
+		geometry.setAttribute("x",r.x());
+		geometry.setAttribute("y",r.y());
+		geometry.setAttribute("width",r.width());
+		geometry.setAttribute("height",r.height());
+		geometry.setAttribute("isMaximized",static_cast<int>(this->maximized()));
 
 		content.appendChild(mainWindow);
 	}
@@ -253,14 +253,14 @@ const bool CProfile::save(TQPtrList<CProfileWindow> windows) {
 		window.setAttribute("hasFocus", p->hasFocus());
 
 		//save geomtery
-		const TQRect r = p->tqgeometry();
-		TQDomElement tqgeometry = doc.createElement("GEOMETRY");
-		tqgeometry.setAttribute("x",r.x());
-		tqgeometry.setAttribute("y",r.y());
-		tqgeometry.setAttribute("width",r.width());
-		tqgeometry.setAttribute("height",r.height());
-		tqgeometry.setAttribute("isMaximized",static_cast<int>(p->maximized()));
-		window.appendChild( tqgeometry );
+		const TQRect r = p->geometry();
+		TQDomElement geometry = doc.createElement("GEOMETRY");
+		geometry.setAttribute("x",r.x());
+		geometry.setAttribute("y",r.y());
+		geometry.setAttribute("width",r.width());
+		geometry.setAttribute("height",r.height());
+		geometry.setAttribute("isMaximized",static_cast<int>(p->maximized()));
+		window.appendChild( geometry );
 
 		TQDomElement modules = doc.createElement("MODULES");
 		modules.setAttribute("separator", "|");
@@ -384,14 +384,14 @@ void CProfile::setMaximized( const bool maximized ) {
 	m_maximized = maximized;
 }
 
-/** Returns the tqgeometry of the main window */
-const TQRect CProfile::tqgeometry() {
-	return m_tqgeometry;
+/** Returns the geometry of the main window */
+const TQRect CProfile::geometry() {
+	return m_geometry;
 }
 
 /** Stes the geoemtry of the main window */
 void CProfile::setGeometry( const TQRect rect ) {
-	m_tqgeometry = rect;
+	m_geometry = rect;
 }
 
 } //end of namespace Profile

bibletime/frontend/cprofile.h

@@ -78,9 +78,9 @@ public:
 	*/
 	void setGeometry( const TQRect rect );
 	/**
-	* Returns the tqgeometry of the main window
+	* Returns the geometry of the main window
 	*/
-	const TQRect tqgeometry();
+	const TQRect geometry();
 
 private:
 	/**
@@ -94,7 +94,7 @@ private:
 	TQString m_filename;
 	bool m_fullscreen;
 	bool m_maximized;
-	TQRect m_tqgeometry;
+	TQRect m_geometry;
 };
 
 } //end of namespace Profile

bibletime/frontend/cprofilewindow.cpp

@@ -29,7 +29,7 @@ m_writeWindowType(0) {
 CProfileWindow::~CProfileWindow() {}
 
 /** Returns the size of the window including the x,y coordinates. */
-const TQRect& CProfileWindow::tqgeometry() const {
+const TQRect& CProfileWindow::geometry() const {
 	return m_windowGeometry;
 }
 

bibletime/frontend/cprofilewindow.h

@@ -54,7 +54,7 @@ public:
 	/**
 	* Returns the size of the window including the x,y coordinates.
 	*/
-	const TQRect& tqgeometry() const;
+	const TQRect& geometry() const;
 	/**
 	* Returns a list of module names which are chosen in the managed window profile.
 	*/

bibletime/frontend/crossrefrendering.cpp

@@ -72,14 +72,14 @@ namespace InfoDisplay {
 		if (!linkText.isEmpty()) { //if we have a valid link text
 			//     qWarning("rendering");
 			return TQString("<a href=\"%1\">%2</a>")
-				   .tqarg(
+				   .arg(
 					   CReferenceManager::encodeHyperlink(
 						   module->name(),
 						   item.key(),
 						   CReferenceManager::typeFromModule(module->type())
 					   )
 				   )
-				   .tqarg(linkText);
+				   .arg(linkText);
 		}
 
 		return TQString();

bibletime/frontend/cswordsetupdialog.cpp

@@ -75,44 +75,44 @@ namespace BookshelfManager {
 		TQFrame* page = m_swordConfigPage = addPage(i18n("Bookshelf path(s)"), TQString(), SmallIcon("bt_swordconfig",32));
 		page->setMinimumSize(500,400);
 
-		TQGridLayout* tqlayout = new TQGridLayout(page, 6, 4);
-		tqlayout->setMargin(5);
+		TQGridLayout* layout = new TQGridLayout(page, 6, 4);
+		layout->setMargin(5);
 
-		tqlayout->setSpacing(10);
-		tqlayout->setColStretch(0,1);
-		tqlayout->setRowStretch(5,1);
+		layout->setSpacing(10);
+		layout->setColStretch(0,1);
+		layout->setRowStretch(5,1);
 
 		TQLabel* mainLabel = CToolClass::explanationLabel(page,
 							i18n("Configure bookshelf path(s)"),
 							i18n("You can store your bookshelfs in one or more directories, which you can specify here.")
 														);
-		tqlayout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
+		layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
 
 
 		TQString swordConfPath = BTInstallMgr::Tool::LocalConfig::swordConfigFilename();
-		TQLabel* confPathLabel = new TQLabel(i18n("Your bookshelf configuration file is <b>%1</b>").tqarg(swordConfPath), page);
-		tqlayout->addMultiCellWidget(confPathLabel, 1,1,0,3);
+		TQLabel* confPathLabel = new TQLabel(i18n("Your bookshelf configuration file is <b>%1</b>").arg(swordConfPath), page);
+		layout->addMultiCellWidget(confPathLabel, 1,1,0,3);
 
 		m_swordPathListBox = new TQListView(page);
 		//   m_swordPathListBox->setFullWidth(true);
 		m_swordPathListBox->addColumn(i18n("Path to bookshelf"));
 		connect(m_swordPathListBox, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slot_swordPathSelected()));
-		tqlayout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1);
+		layout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1);
 
 		m_swordEditPathButton = new TQPushButton(i18n("Edit Entry"), page);
 		m_swordEditPathButton->setIconSet(SmallIcon("edit", 16));
 		connect(m_swordEditPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordEditClicked()));
-		tqlayout->addWidget(m_swordEditPathButton, 2, 3);
+		layout->addWidget(m_swordEditPathButton, 2, 3);
 
 		m_swordAddPathButton = new TQPushButton(i18n("Add Entry"), page);
 		m_swordAddPathButton->setIconSet(SmallIcon("edit_add", 16));
 		connect(m_swordAddPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordAddClicked()));
-		tqlayout->addWidget(m_swordAddPathButton, 3,3);
+		layout->addWidget(m_swordAddPathButton, 3,3);
 
 		m_swordRemovePathButton = new TQPushButton(i18n("Remove Entry"), page);
 		m_swordRemovePathButton->setIconSet(SmallIcon("editdelete", 16));
 		connect(m_swordRemovePathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordRemoveClicked()));
-		tqlayout->addWidget(m_swordRemovePathButton, 4,3);
+		layout->addWidget(m_swordRemovePathButton, 4,3);
 
 		setupSwordPathListBox();
 	}
@@ -120,25 +120,25 @@ namespace BookshelfManager {
 	void CSwordSetupDialog::initInstall() {
 		m_installPage = addPage(i18n("Install/Update works"), TQString(), SmallIcon("bt_bible",32));
 
-		TQVBoxLayout* vboxtqlayout = new TQVBoxLayout(m_installPage);
-		TQHBoxLayout* hboxtqlayout = new TQHBoxLayout();
-		hboxtqlayout->setAutoAdd( true );
+		TQVBoxLayout* vboxlayout = new TQVBoxLayout(m_installPage);
+		TQHBoxLayout* hboxlayout = new TQHBoxLayout();
+		hboxlayout->setAutoAdd( true );
 
-		vboxtqlayout->addLayout(hboxtqlayout);
+		vboxlayout->addLayout(hboxlayout);
 
 		m_installWidgetStack = new TQWidgetStack(m_installPage);
-		hboxtqlayout->addWidget(m_installWidgetStack);
+		hboxlayout->addWidget(m_installWidgetStack);
 
 		m_installSourcePage = new TQWidget(0);
 		m_installWidgetStack->addWidget(m_installSourcePage);
 
 		//  m_installSourcePage->setMinimumSize(500,400);
 
-		TQGridLayout* tqlayout = new TQGridLayout(m_installSourcePage, 7, 3);
-		tqlayout->setMargin(5);
-		tqlayout->setSpacing(10);
-		tqlayout->setRowStretch(6,5);
-		tqlayout->setColStretch(0,5);
+		TQGridLayout* layout = new TQGridLayout(m_installSourcePage, 7, 3);
+		layout->setMargin(5);
+		layout->setSpacing(10);
+		layout->setRowStretch(6,5);
+		layout->setColStretch(0,5);
 
 		TQLabel* installLabel = CToolClass::explanationLabel(m_installSourcePage,
 							   i18n("Install/update works - Step 1"),
@@ -147,39 +147,39 @@ After that step click on the connect button.<br/>\
 <b>WARNING: If you live in a persecuted country and do not wish to risk detection you should NOT use \
 the module remote installation feature!</b>")
 														   );
-		tqlayout->addMultiCellWidget(installLabel, 0,0,0,2);
+		layout->addMultiCellWidget(installLabel, 0,0,0,2);
 
-		TQLabel* sourceHeadingLabel = new TQLabel(TQString("<b>%1</b>").tqarg(i18n("Select library")), m_installSourcePage);
-		tqlayout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1);
+		TQLabel* sourceHeadingLabel = new TQLabel(TQString("<b>%1</b>").arg(i18n("Select library")), m_installSourcePage);
+		layout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1);
 
 		m_sourceCombo = new TQComboBox(m_installSourcePage);
-		tqlayout->addWidget(m_sourceCombo, 2, 0);
+		layout->addWidget(m_sourceCombo, 2, 0);
 
 		TQPushButton* deleteSourceButton = new TQPushButton(i18n("Delete library"), m_installSourcePage);
 		deleteSourceButton->setIconSet(SmallIcon("remove", 16));
 		connect(deleteSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installDeleteSource()));
-		tqlayout->addWidget(deleteSourceButton, 2, 1, TQt::AlignLeft);
+		layout->addWidget(deleteSourceButton, 2, 1, TQt::AlignLeft);
 
 		TQPushButton* addSourceButton = new TQPushButton(i18n("Add library"), m_installSourcePage);
 		addSourceButton->setIconSet(SmallIcon("folder_new", 16));
 		connect(addSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installAddSource()));
-		tqlayout->addWidget(addSourceButton, 2, 2, TQt::AlignLeft);
+		layout->addWidget(addSourceButton, 2, 2, TQt::AlignLeft);
 
 		m_sourceLabel = new TQLabel(m_installSourcePage);
-		tqlayout->addMultiCellWidget(m_sourceLabel, 3,3,0,1);
+		layout->addMultiCellWidget(m_sourceLabel, 3,3,0,1);
 
-		TQLabel* targetHeadingLabel = new TQLabel(TQString("<b>%1</b>").tqarg(i18n("Select bookshelf path")), m_installSourcePage);
-		tqlayout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1);
+		TQLabel* targetHeadingLabel = new TQLabel(TQString("<b>%1</b>").arg(i18n("Select bookshelf path")), m_installSourcePage);
+		layout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1);
 
 		m_targetCombo = new TQComboBox(m_installSourcePage);
-		tqlayout->addWidget(m_targetCombo, 5, 0);
+		layout->addWidget(m_targetCombo, 5, 0);
 
 		m_targetLabel = new TQLabel(m_installSourcePage);
-		tqlayout->addMultiCellWidget(m_targetLabel, 6,6,0,0,TQt::AlignTop);
+		layout->addMultiCellWidget(m_targetLabel, 6,6,0,0,TQt::AlignTop);
 
-		//part beloew main tqlayout with the back/next buttons
+		//part beloew main layout with the back/next buttons
 		TQHBoxLayout* myHBox = new TQHBoxLayout();
-		vboxtqlayout->addLayout(myHBox);
+		vboxlayout->addLayout(myHBox);
 
 		m_installBackButton = new TQPushButton(i18n("Back"), m_installPage);
 		m_installBackButton->setIconSet(SmallIcon("back",16));
@@ -207,28 +207,28 @@ the module remote installation feature!</b>")
 
 		page->setMinimumSize(500,400);
 
-		TQGridLayout* tqlayout = new TQGridLayout(page, 4, 4);
-		tqlayout->setMargin(5);
+		TQGridLayout* layout = new TQGridLayout(page, 4, 4);
+		layout->setMargin(5);
 
-		tqlayout->setSpacing(10);
-		tqlayout->setColStretch(1,1);
-		tqlayout->setRowStretch(2,1);
+		layout->setSpacing(10);
+		layout->setColStretch(1,1);
+		layout->setRowStretch(2,1);
 
 		TQLabel* mainLabel= CToolClass::explanationLabel(page,
 						   i18n("Remove installed work(s)"),
 						   i18n("This dialog lets you remove installed works from your system. Choose the modules and then click on the remove button.")
 													   );
-		tqlayout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
+		layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
 
-		TQLabel* headingLabel = new TQLabel(TQString("<b>%1</b>").tqarg(i18n("Select works to be uninstalled")), page);
-		tqlayout->addMultiCellWidget(headingLabel, 1, 1, 0, 3);
+		TQLabel* headingLabel = new TQLabel(TQString("<b>%1</b>").arg(i18n("Select works to be uninstalled")), page);
+		layout->addMultiCellWidget(headingLabel, 1, 1, 0, 3);
 
 		m_removeModuleListView = new CSwordSetupModuleListView(page, false);
-		tqlayout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3);
+		layout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3);
 
 		m_removeRemoveButton = new TQPushButton(i18n("Remove selected work(s)"), page);
 		m_removeRemoveButton->setIconSet( SmallIcon("edittrash", 16) );
-		tqlayout->addWidget(m_removeRemoveButton, 3, 3, TQt::AlignRight);
+		layout->addWidget(m_removeRemoveButton, 3, 3, TQt::AlignRight);
 
 		connect(m_removeRemoveButton, TQT_SIGNAL(clicked()),
 				this, TQT_SLOT(slot_doRemoveModules()));
@@ -379,10 +379,10 @@ the module remote installation feature!</b>")
 		sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, source) ;
 
 		if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
-			url = TQString("ftp://%1%2").tqarg(is.source.c_str()).tqarg(is.directory.c_str());
+			url = TQString("ftp://%1%2").arg(is.source.c_str()).arg(is.directory.c_str());
 		}
 		else {
-			url = TQString("%1").tqarg(is.directory.c_str());
+			url = TQString("%1").arg(is.directory.c_str());
 		}
 		m_sourceLabel->setText( url );
 
@@ -405,7 +405,7 @@ the module remote installation feature!</b>")
 		}
 
 		const TQString message = i18n("You selected the following work(s): %1.\n\n"
-									 "Do you really want to remove them from your system?").tqarg(moduleList.join(", "));
+									 "Do you really want to remove them from your system?").arg(moduleList.join(", "));
 
 		if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) {  //Yes was pressed.
 			sword::InstallMgr installMgr;
@@ -424,7 +424,7 @@ the module remote installation feature!</b>")
 						prefixPath = prefixPath.remove( prefixPath.find(dataPath), dataPath.length() );
 					}
 					else { //fall back to default Sword config path
-						prefixPath = TQString::tqfromLatin1(backend()->prefixPath);
+						prefixPath = TQString::fromLatin1(backend()->prefixPath);
 					}
 
 					sword::SWMgr* mgr = mgrDict[ prefixPath ];
@@ -612,16 +612,16 @@ the module remote installation feature!</b>")
 		if (!m_installModuleListPage) { //the widgets are not yet created
 			m_installModuleListPage = new TQWidget(0);
 
-			TQGridLayout* tqlayout = new TQGridLayout(m_installModuleListPage, 7, 2);
-			tqlayout->setMargin(5);
-			tqlayout->setSpacing(10);
+			TQGridLayout* layout = new TQGridLayout(m_installModuleListPage, 7, 2);
+			layout->setMargin(5);
+			layout->setSpacing(10);
 
 			TQLabel* installLabel = CToolClass::explanationLabel(m_installModuleListPage,
 								   i18n("Install/update works - Step 2"),
 								   i18n("Please choose the works which should be installed and/or updated and click the install button.")
 															   );
-			tqlayout->addMultiCellWidget(installLabel, 0,0,0,1);
-			tqlayout->setRowStretch(0,0);
+			layout->addMultiCellWidget(installLabel, 0,0,0,1);
+			layout->setRowStretch(0,0);
 
 			m_installWidgetStack->addWidget(m_installModuleListPage);
 			m_installModuleListPage->setMinimumSize(500,400);
@@ -631,9 +631,9 @@ the module remote installation feature!</b>")
 			sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, currentInstallSource());
 
 			m_installModuleListView = new CSwordSetupModuleListView(m_installModuleListPage, true, &is);
-			tqlayout->addMultiCellWidget( m_installModuleListView, 1,6,0,1);
-			tqlayout->setColStretch(0,5);
-			tqlayout->setRowStretch(1,5);
+			layout->addMultiCellWidget( m_installModuleListView, 1,6,0,1);
+			layout->setColStretch(0,5);
+			layout->setRowStretch(1,5);
 
 			connect(m_installModuleListView, TQT_SIGNAL(selectedModulesChanged()), TQT_SLOT(slot_installModulesChanged()));
 		}
@@ -696,7 +696,7 @@ the module remote installation feature!</b>")
 		}
 
 		const TQString message = i18n("You selected the following works: %1.\n\n\
- Do you really want to install them on your system?").tqarg(moduleList.join(", "));
+ Do you really want to install them on your system?").arg(moduleList.join(", "));
 
 		if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) {  //Yes was pressed.
 			BTInstallMgr iMgr;
@@ -758,7 +758,7 @@ the module remote installation feature!</b>")
 						//prefixPath = prefixPath.replace(dataPath, ""); //old code working with TQt 3.2
 					}
 					else {
-						prefixPath = TQString::tqfromLatin1(backend()->prefixPath);
+						prefixPath = TQString::fromLatin1(backend()->prefixPath);
 					}
 
 					sword::SWMgr mgr(prefixPath.latin1());
@@ -795,7 +795,7 @@ the module remote installation feature!</b>")
 	void CSwordSetupDialog::installCompleted( const int total, const int /* file */) {
 		if (m_progressDialog) {
 			m_progressDialog->progressBar()->setProgress(total+100*m_installedModuleCount);
-			m_progressDialog->setLabel( i18n("[%1]: %2% complete").tqarg(m_installingModule).tqarg(total) );
+			m_progressDialog->setLabel( i18n("[%1]: %2% complete").arg(m_installingModule).arg(total) );
 		}
 		KApplication::kApplication()->processEvents();
 	}

bibletime/frontend/cswordsetupinstallsourcesdialog.cpp

@@ -49,29 +49,29 @@ namespace BookshelfManager {
 
 		mainLayout->addSpacing( 10 );
 
-		TQGridLayout* tqlayout = new TQGridLayout( mainLayout, 3, 3 );
-		tqlayout->setSpacing( 5 );
+		TQGridLayout* layout = new TQGridLayout( mainLayout, 3, 3 );
+		layout->setSpacing( 5 );
 
 		label = new TQLabel(i18n("Type"), this);
-		tqlayout->addWidget( label, 0, 0);
+		layout->addWidget( label, 0, 0);
 
 		m_serverLabel = new TQLabel(i18n("Server"), this);
-		tqlayout->addWidget( m_serverLabel, 0, 1);
+		layout->addWidget( m_serverLabel, 0, 1);
 
 		label = new TQLabel(i18n("Path"), this);
-		tqlayout->addWidget( label, 0, 2 );
+		layout->addWidget( label, 0, 2 );
 
 		m_protocolCombo = new TQComboBox( this );
-		tqlayout->addWidget(m_protocolCombo, 1, 0);
+		layout->addWidget(m_protocolCombo, 1, 0);
 		m_protocolCombo->insertItem( PROTO_FTP  );
 		m_protocolCombo->insertItem( PROTO_FILE );
 
 		m_serverEdit = new TQLineEdit( this );
-		tqlayout->addWidget( m_serverEdit, 1, 1 );
+		layout->addWidget( m_serverEdit, 1, 1 );
 		m_serverEdit->setText("ftp.crosswire.org");
 
 		m_pathEdit = new TQLineEdit( this );
-		tqlayout->addWidget( m_pathEdit, 1, 2 );
+		layout->addWidget( m_pathEdit, 1, 2 );
 		m_pathEdit->setText("/pub/sword/raw");
 
 		mainLayout->addSpacing( 10 );

bibletime/frontend/cswordsetupmodulelistview.cpp

@@ -50,7 +50,7 @@ namespace BookshelfManager {
             TQListViewItem* i = m_parent->itemAt(pos);
             Q_ASSERT(i);
 
-            const TQRect rect = m_parent->tqitemRect(i);
+            const TQRect rect = m_parent->itemRect(i);
             if (m_parent->showTooltip(i, pos, 0)) {
                 const TQString tipText = m_parent->tooltip(i, 0);
                 tip(rect, tipText);

bibletime/frontend/display/cdisplay.cpp

@@ -139,7 +139,7 @@ CDisplay::~CDisplay() {
 const bool CDisplay::copy( const CDisplay::TextType format, const CDisplay::TextPart part  ) {
 	const TQString content = text(format, part);
 
-	TQClipboard* cb = KApplication::tqclipboard();
+	TQClipboard* cb = KApplication::clipboard();
 	cb->setText(content);
 	return true;
 }

bibletime/frontend/display/chtmlreaddisplay.cpp

@@ -168,9 +168,9 @@ const TQString CHTMLReadDisplay::text( const CDisplay::TextType format, const CD
 					.append(key->module()->name())
 					.append(")");
 				/*    ("%1\n(%2, %3)")
-					.tqarg()
-					.tqarg(key->key())
-					.tqarg(key->module()->name());*/
+					.arg()
+					.arg(key->key())
+					.arg(key->module()->name());*/
 			}
 			return TQString();
 		}

bibletime/frontend/display/chtmlwritedisplay.cpp

@@ -66,19 +66,19 @@ void CHTMLWriteDisplay::toggleUnderline() {
 
 
 void CHTMLWriteDisplay::alignLeft() {
-	tqsetAlignment(TQt::AlignLeft);
+	setAlignment(TQt::AlignLeft);
 };
 
 void CHTMLWriteDisplay::alignCenter() {
-	tqsetAlignment(TQt::AlignHCenter);
+	setAlignment(TQt::AlignHCenter);
 };
 
 void CHTMLWriteDisplay::alignRight() {
-	tqsetAlignment(TQt::AlignRight);
+	setAlignment(TQt::AlignRight);
 };
 
 
-/** The text's tqalignment changed. Enable the right buttons. */
+/** The text's alignment changed. Enable the right buttons. */
 void CHTMLWriteDisplay::slotAlignmentChanged( int a ) {
 	bool alignLeft = false;
 	bool alignCenter = false;
@@ -99,7 +99,7 @@ void CHTMLWriteDisplay::slotAlignmentChanged( int a ) {
 	//  }
 	else {
 		alignLeft = true;
-		qWarning("unknown tqalignment %i", a);
+		qWarning("unknown alignment %i", a);
 	}
 
 	m_actions.alignLeft->setChecked( alignLeft );
@@ -153,7 +153,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
 
 	m_colorButton = new KColorButton(bar);
 	connect(m_colorButton, TQT_SIGNAL(changed(const TQColor&)), TQT_TQOBJECT(this), TQT_SLOT(slotColorSelected(const TQColor&)));
-	bar->insertWidget(50, m_colorButton->tqsizeHint().width(), m_colorButton);
+	bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton);
 	TQToolTip::add
 		(m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::tooltip );
 
@@ -195,7 +195,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
 	m_actions.underline->plug(bar);
 
 
-	(new KActionSeparator())->plug(bar); //seperate formatting from tqalignment buttons
+	(new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons
 
 	m_actions.alignLeft = new KToggleAction( i18n("Left"),
 						  CResMgr::displaywindows::writeWindow::alignLeft::icon,
@@ -248,7 +248,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
 
 	//set initial values for toolbar items
 	slotFontChanged( font() );
-	slotAlignmentChanged( tqalignment() );
+	slotAlignmentChanged( alignment() );
 	slotColorChanged( color() );
 }
 

bibletime/frontend/display/chtmlwritedisplay.h

@@ -70,7 +70,7 @@ protected slots:
 
 	void slotFontChanged( const TQFont& );
 	/**
-	* The text's tqalignment changed. Enable the right buttons.
+	* The text's alignment changed. Enable the right buttons.
 	*/
 	void slotAlignmentChanged( int );
 	/**

bibletime/frontend/display/cplainwritedisplay.cpp

@@ -138,7 +138,7 @@ void CPlainWriteDisplay::contentsDropEvent( TQDropEvent* e ) {
 
 					TQString moduleText = key->strippedText();
 
-					const TQString text = TQString::tqfromLatin1("%1\n(%2, %3)\n").tqarg(moduleText).tqarg((*it).bookmarkKey()).tqarg((*it).bookmarkModule());
+					const TQString text = TQString::fromLatin1("%1\n(%2, %3)\n").arg(moduleText).arg((*it).bookmarkKey()).arg((*it).bookmarkModule());
 
 					placeCursor( e->pos() );
 					insert( text );

bibletime/frontend/displaywindow/cbiblereadwindow.cpp

@@ -53,10 +53,10 @@ void CBibleReadWindow::applyProfileSettings( CProfileWindow* const settings ) {
 	for (int i = count-1; i>=1; i--) {
 		if (result-(int)pow((double)2,i-1)>= 0) { //2^i was added before, so item with index i is set
 			result -= (int)pow((double)2,i-1);
-			displaySettingsButton()->setItemtqStatus(i,true);
+			displaySettingsButton()->setItemStatus(i,true);
 		}
 		else {
-			displaySettingsButton()->setItemtqStatus(i,false);
+			displaySettingsButton()->setItemStatus(i,false);
 		}
 	}
 	displaySettingsButton()->setChanged();
@@ -69,7 +69,7 @@ void CBibleReadWindow::storeProfileSettings( CProfileWindow* const settings ) {
 	int result = 0;
 	//now check every item
 	for (int i = 1; i < count; i++) { //first item is a title
-		if (displaySettingsButton()->itemtqStatus(i)) //item is checked
+		if (displaySettingsButton()->itemStatus(i)) //item is checked
 			result += (int)pow((double)2,i-1);//add 2^i (the i. digit in binary)
 	}
 	settings->setWindowSettings(result);

bibletime/frontend/displaywindow/cbookreadwindow.cpp

@@ -134,7 +134,7 @@ void CBookReadWindow::initToolbars() {
 	m_actions.backInHistory->plug( mainToolBar(), 0 );
 	m_actions.forwardInHistory->plug( mainToolBar(), 1 );
 
-	mainToolBar()->insertWidget(0,keyChooser()->tqsizeHint().width(),keyChooser());
+	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
 
 	m_treeAction->plug(buttonsToolBar());
 	m_treeAction->setChecked(false);

bibletime/frontend/displaywindow/cbuttons.cpp

@@ -65,7 +65,7 @@
 //   sword::StringList::iterator it;
 //
 //   for (it = options.begin(); it != options.end(); ++it) {
-//   int id = m_popup->insertItem(TQString::tqfromLatin1((*it).c_str()));
+//   int id = m_popup->insertItem(TQString::fromLatin1((*it).c_str()));
 //   if (m_filterOptions->transliteration == m_popup->indexOf(id)-1 ) { //workaround
 //    m_popup->setItemChecked(id, true);
 //   }
@@ -198,7 +198,7 @@ const int CDisplaySettingsButton::menuItemCount() {
 }
 
 /** Sets the item at position pos to the satet given as 2nd paramter. */
-void CDisplaySettingsButton::setItemtqStatus( const int index, const bool checked ) {
+void CDisplaySettingsButton::setItemStatus( const int index, const bool checked ) {
 	const int ID = m_popup->idAt(index);
 	m_popup->setItemChecked(ID, checked);
 	const TQString text = m_popup->text(ID).remove('&');
@@ -208,7 +208,7 @@ void CDisplaySettingsButton::setItemtqStatus( const int index, const bool checke
 }
 
 /** Returns the status of the item at position "index" */
-const bool CDisplaySettingsButton::itemtqStatus( const int index ) {
+const bool CDisplaySettingsButton::itemStatus( const int index ) {
 	return m_popup->isItemChecked( m_popup->idAt(index) );
 }
 

bibletime/frontend/displaywindow/cbuttons.h

@@ -65,7 +65,7 @@ public:
 	/**
 	* Sets the item at position pos to the satet given as 2nd paramter.
 	*/
-	void setItemtqStatus( const int pos, const bool checked );
+	void setItemStatus( const int pos, const bool checked );
 	/**
 	* Returns the number of usable menu items in the setttings menu.
 	*/
@@ -73,7 +73,7 @@ public:
 	/**
 	* Returns the status of the item at position "index"
 	*/
-	const bool itemtqStatus( const int index );
+	const bool itemStatus( const int index );
 	/**
 	* Sets the status to changed. The signal changed will be emitted.
 	*/

bibletime/frontend/displaywindow/chtmlwritewindow.cpp

@@ -41,7 +41,7 @@ void CHTMLWriteWindow::initView() {
 	addDockWindow(mainToolBar());
 
 	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->tqsizeHint().width(),keyChooser());
+	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
 	mainToolBar()->setFullSize(false);
 };
 

bibletime/frontend/displaywindow/clexiconreadwindow.cpp

@@ -162,7 +162,7 @@ void CLexiconReadWindow::initView() {
 
 	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
 
-	mainToolBar()->insertWidget(0, keyChooser()->tqsizeHint().width(), keyChooser());
+	mainToolBar()->insertWidget(0, keyChooser()->sizeHint().width(), keyChooser());
 	mainToolBar()->setFullSize(false);
 
 	setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), this) );

bibletime/frontend/displaywindow/cmodulechooserbutton.cpp

@@ -190,7 +190,7 @@ void CModuleChooserButton::populateMenu() {
 		TQString lang = (*it)->language()->translatedName();
 
 		if (lang.isEmpty()) {
-			//lang = TQString::tqfromLatin1("xx"); //unknown language -- do not use English as default!!
+			//lang = TQString::fromLatin1("xx"); //unknown language -- do not use English as default!!
 			lang = (*it)->language()->abbrev();
 			if (lang.isEmpty()) {
 				lang = "xx";

bibletime/frontend/displaywindow/cplainwritewindow.cpp

@@ -46,7 +46,7 @@ void CPlainWriteWindow::initView() {
 	addDockWindow(mainToolBar());
 
 	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->tqsizeHint().width(),keyChooser());
+	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
 	mainToolBar()->setFullSize(false);
 
 }
@@ -134,9 +134,9 @@ void CPlainWriteWindow::saveCurrentText( const TQString& /*key*/ ) {
 		textChanged();
 	} else {
 		KMessageBox::error( this,
-				    TQString::tqfromLatin1("<qt><B>%1</B><BR>%2</qt>")
-				    .tqarg( i18n("Module is not writable.") )
-				    .tqarg( i18n("Either the module may not be edited, or "
+				    TQString::fromLatin1("<qt><B>%1</B><BR>%2</qt>")
+				    .arg( i18n("Module is not writable.") )
+				    .arg( i18n("Either the module may not be edited, or "
 					       "you do not have write permission.") ),
 				    i18n("Module not writable") );
 	}

bibletime/frontend/displaywindow/creadwindow.cpp

@@ -157,7 +157,7 @@ void CReadWindow::applyProfileSettings(CProfileWindow * const settings) {
 		parentWidget()->showMaximized();
 	}
 	else {
-		const TQRect rect = settings->tqgeometry();
+		const TQRect rect = settings->geometry();
 		resize(rect.width(), rect.height());
 		parentWidget()->move(rect.x(), rect.y());
 	}

bibletime/frontend/displaywindow/cwritewindow.cpp

@@ -69,7 +69,7 @@ void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) {
 		sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
 		TQString oldLang;
 		if (vk) {
-			oldLang = TQString::tqfromLatin1(vk->getLocale());
+			oldLang = TQString::fromLatin1(vk->getLocale());
 			vk->setLocale("en"); //save english locale names as default!
 		}
 		settings->setKey( key()->key() );
@@ -95,10 +95,10 @@ void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) {
 		parentWidget()->showMaximized();
 	}
 	else {
-		const TQRect rect = settings->tqgeometry();
+		const TQRect rect = settings->geometry();
 		resize(rect.width(), rect.height());
 		parentWidget()->move(rect.x(), rect.y());
-		//setGeometry( settings->tqgeometry() );
+		//setGeometry( settings->geometry() );
 	}
 	// displayWidget()->view()->horizontalScrollBar()->setValue( settings->scrollbarPositions().horizontal );
 	// m_htmlWidget->view()->verticalScrollBar()->setValue( settings->scrollbarPositions().vertical );

bibletime/frontend/keychooser/cbiblekeychooser.cpp

@@ -38,11 +38,11 @@ m_key(dynamic_cast<CSwordVerseKey*>(key)) {
 		m_key = 0;
 		return;
 	}
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
-	tqlayout->setDirection( TQBoxLayout::LeftToRight );
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
+	layout->setDirection( TQBoxLayout::LeftToRight );
 
 	w_ref = new CKeyReferenceWidget(dynamic_cast<CSwordBibleModuleInfo*>(m_modules.first()), m_key, this);
-	tqlayout->addWidget(w_ref);
+	layout->addWidget(w_ref);
 
 	connect(w_ref,TQT_SIGNAL(changed(CSwordVerseKey *)),TQT_SLOT(refChanged(CSwordVerseKey *)));
 

bibletime/frontend/keychooser/cbooktreechooser.cpp

@@ -135,10 +135,10 @@ m_key( dynamic_cast<CSwordTreeKey*>(key) ) {
 	}
 
 	//now setup the keychooser widgets
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+	TQHBoxLayout* layout = new TQHBoxLayout(this);
 
 	m_treeView = new KListView(this);
-	tqlayout->addWidget(m_treeView);
+	layout->addWidget(m_treeView);
 	m_treeView->addColumn("Tree");
 	m_treeView->header()->hide();
 	m_treeView->setSorting(-1);
@@ -291,7 +291,7 @@ void CBookTreeChooser::show() {
 	if (!m_treeView->childCount()) {
 		KApplication::setOverrideCursor(WaitCursor);
 		setupTree(); //create the first level of the tree structure
-		m_treeView->resize(m_treeView->tqsizeHint());
+		m_treeView->resize(m_treeView->sizeHint());
 		KApplication::restoreOverrideCursor();
 	}
 }

bibletime/frontend/keychooser/ckeychooserwidget.cpp

@@ -147,7 +147,7 @@ void CKeyChooserWidget::reset(TQStringList *list, int index, bool do_emit) {
 	oldKey = TQString();
 
 	//  m_comboBox->setUpdatesEnabled(false);
-	//DON'T REMOVE THE HIDE: Otherwise TQComboBox's tqsizeHint() function won't work properly
+	//DON'T REMOVE THE HIDE: Otherwise TQComboBox's sizeHint() function won't work properly
 	m_comboBox->hide();
 	m_comboBox->clear();
 	if (list) {
@@ -168,8 +168,8 @@ void CKeyChooserWidget::reset(TQStringList *list, int index, bool do_emit) {
 		emit changed(m_comboBox->currentItem());
 	}
 
-	const TQSize dummySize = m_comboBox->tqsizeHint(); //without this function call the combo box won't be properly sized!
-	//DON'T REMOVE OR MOVE THE show()! Otherwise TQComboBox's tqsizeHint() function won't work properly!
+	const TQSize dummySize = m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized!
+	//DON'T REMOVE OR MOVE THE show()! Otherwise TQComboBox's sizeHint() function won't work properly!
 	m_comboBox->show();
 
 	//  m_comboBox->setFont( m_comboBox->font() );

bibletime/frontend/keychooser/ckeychooserwidget.h

@@ -44,7 +44,7 @@ public:
 	/**
 	* Returns the size this widget would like to have.
 	*/
-	//  virtual TQSize tqsizeHint() const;
+	//  virtual TQSize sizeHint() const;
 
 protected:
 	/**

bibletime/frontend/keychooser/clexiconkeychooser.cpp

@@ -37,7 +37,7 @@ m_key(dynamic_cast<CSwordLDKey*>(key)) {
 
 	setModules(modules, false);
 
-	//we use a tqlayout because the key chooser should be resized to full size
+	//we use a layout because the key chooser should be resized to full size
 	m_layout = new TQHBoxLayout(this, TQBoxLayout::LeftToRight);
 	m_layout->setResizeMode(TQLayout::FreeResize);
 

bibletime/frontend/keychooser/crefselectdialog.cpp

@@ -33,15 +33,15 @@
 //{
 //   m_page = new TQWidget( this );
 //   m_placeholder = new TQWidget( m_page);
-//   TQVBoxLayout* tqlayout = new TQVBoxLayout( m_page, 0, spacingHint());
+//   TQVBoxLayout* layout = new TQVBoxLayout( m_page, 0, spacingHint());
 //   m_lineedit = new TQLineEdit( TQString(), m_page, "select" );
 //   m_lineedit->setMinimumWidth(fontMetrics().maxWidth()*8);
 //
-//   TQHBoxLayout* htqlayout = new TQHBoxLayout(m_page, 0, spacingHint());
-//   htqlayout->addWidget(new TQLabel(i18n("Verse key:"), m_page));
-//   htqlayout->addWidget(m_lineedit);
-//   tqlayout->addItem(htqlayout);
-//   tqlayout->addWidget(m_placeholder);
+//   TQHBoxLayout* hlayout = new TQHBoxLayout(m_page, 0, spacingHint());
+//   hlayout->addWidget(new TQLabel(i18n("Verse key:"), m_page));
+//   hlayout->addWidget(m_lineedit);
+//   layout->addItem(hlayout);
+//   layout->addWidget(m_placeholder);
 //
 //   m_chooser = NULL;
 //   m_oldParent = NULL;

bibletime/frontend/keychooser/cscrollerwidgetset.cpp

@@ -37,9 +37,9 @@ const unsigned int MOVER_HEIGHT = 6;
 
 CScrollerWidgetSet::CScrollerWidgetSet(TQWidget *parent, const char *name) : TQWidget(parent,name) {
 	m_layout = new TQVBoxLayout(this);
-	m_layout->tqsetAlignment(TQt::AlignHCenter | TQt::AlignCenter);
+	m_layout->setAlignment(TQt::AlignHCenter | TQt::AlignCenter);
 
-	//tqsetAlignment(TQt::AlignHCenter | TQt::AlignCenter);
+	//setAlignment(TQt::AlignHCenter | TQt::AlignCenter);
 
 	btn_up = new TQToolButton( UpArrow, this, "btn_up" );
 	btn_up->setFixedSize(WIDTH, ARROW_HEIGHT);

bibletime/frontend/kstartuplogo.cpp

@@ -67,7 +67,7 @@ KStartupLogo::KStartupLogo()
 
 	//Please not change the margin
 	textLabel = new TQLabel(this);
-	textLabel->setGeometry(0,pm.height(),pm.width(),textLabel->tqsizeHint().height()+10);
+	textLabel->setGeometry(0,pm.height(),pm.width(),textLabel->sizeHint().height()+10);
 	textLabel->setBackgroundColor( TQColor("#0d6de9") );
 	textLabel->setFrameStyle(TQFrame::Panel | TQFrame::Plain);
 	textLabel->setLineWidth(1);
@@ -94,7 +94,7 @@ KStartupLogo::KStartupLogo()
 
 void KStartupLogo::setText(const TQString text) {
 	//Please not make the text bold & let the first character be blank
-	textLabel->setText( TQString::tqfromLatin1(" %1").tqarg(text) );
+	textLabel->setText( TQString::fromLatin1(" %1").arg(text) );
 	KApplication::kApplication()->processEvents();
 }
 

bibletime/frontend/mainindex/cindexitem.cpp

@@ -284,9 +284,9 @@ void CBookmarkItem::update() {
 	setMultiLinesEnabled(true);
 	setPixmap(0,SmallIcon(CResMgr::mainIndex::bookmark::icon,16));
 
-	const TQString title = TQString::tqfromLatin1("%1 (%2)")
-						  .tqarg(key())
-						  .tqarg(module() ? module()->name() : i18n("unknown"));
+	const TQString title = TQString::fromLatin1("%1 (%2)")
+						  .arg(key())
+						  .arg(module() ? module()->name() : i18n("unknown"));
 	setText(0, title);
 }
 
@@ -325,19 +325,19 @@ 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>")
-			  .tqarg(key())
-			  .tqarg(module()->name())
-			  .tqarg(description())
-			  .tqarg(fontPair.second.family())
-			  .tqarg(k->renderedText());
+		ret = TQString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr><font face=\"%4\" size=\"4\">%5</font>")
+			  .arg(key())
+			  .arg(module()->name())
+			  .arg(description())
+			  .arg(fontPair.second.family())
+			  .arg(k->renderedText());
 	}
 	else {
-		ret = TQString::tqfromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr>%4")
-			  .tqarg(key())
-			  .tqarg(module()->name())
-			  .tqarg(description())
-			  .tqarg(k->renderedText());
+		ret = TQString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr>%4")
+			  .arg(key())
+			  .arg(module()->name())
+			  .arg(description())
+			  .arg(k->renderedText());
 	}
 
 	return ret;
@@ -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;
 

bibletime/frontend/mainindex/cmainindex.cpp

@@ -51,7 +51,7 @@ void CMainIndex::ToolTip::maybeTip(const TQPoint& p) {
 		return;
 	}
 
-	TQRect r = m_mainIndex->tqitemRect(i);
+	TQRect r = m_mainIndex->itemRect(i);
 	if (!r.isValid()) {
 		return;
 	}

bibletime/frontend/manageindicesform.cpp

@@ -32,7 +32,7 @@ ManageIndicesForm::ManageIndicesForm( TQWidget* parent, const char* name, WFlags
     ManageIndicesFormLayout = new TQVBoxLayout( this, 0, 8, "ManageIndicesFormLayout"); 
 
     m_labelFrame = new TQFrame( this, "m_labelFrame" );
-    m_labelFrame->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, m_labelFrame->sizePolicy().hasHeightForWidth() ) );
+    m_labelFrame->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, m_labelFrame->sizePolicy().hasHeightForWidth() ) );
     m_labelFrame->setFrameShape( TQFrame::NoFrame );
     m_labelFrame->setFrameShadow( TQFrame::Plain );
     ManageIndicesFormLayout->addWidget( m_labelFrame );
@@ -43,18 +43,18 @@ ManageIndicesForm::ManageIndicesForm( TQWidget* parent, const char* name, WFlags
     m_moduleList = new KListView( this, "m_moduleList" );
     ManageIndicesFormLayout->addWidget( m_moduleList );
 
-    tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); 
+    layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); 
     spacer1 = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tqlayout1->addItem( spacer1 );
+    layout1->addItem( spacer1 );
 
     m_createIndicesButton = new TQPushButton( this, "m_createIndicesButton" );
-    tqlayout1->addWidget( m_createIndicesButton );
+    layout1->addWidget( m_createIndicesButton );
 
     m_deleteIndicesButton = new TQPushButton( this, "m_deleteIndicesButton" );
-    tqlayout1->addWidget( m_deleteIndicesButton );
-    ManageIndicesFormLayout->addLayout( tqlayout1 );
+    layout1->addWidget( m_deleteIndicesButton );
+    ManageIndicesFormLayout->addLayout( layout1 );
     languageChange();
-    resize( TQSize(415, 404).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(415, 404).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 

bibletime/frontend/manageindicesform.ui

@@ -62,7 +62,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -78,7 +78,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>

bibletime/frontend/searchdialog/cmodulechooser.cpp

@@ -283,10 +283,10 @@ void CModuleChooserDialog::initView() {
 	setButtonOKText(i18n("Use chosen work(s)"));
 
 	TQFrame* page = plainPage();
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(page);
+	TQHBoxLayout* layout = new TQHBoxLayout(page);
 	m_moduleChooser = new CModuleChooser(page);
 	m_moduleChooser->setMinimumSize(320,400);
-	tqlayout->addWidget(m_moduleChooser);
+	layout->addWidget(m_moduleChooser);
 }
 
 /** Initializes the connections of this dialog. */

bibletime/frontend/searchdialog/crangechooser.cpp

@@ -100,7 +100,7 @@ void CRangeChooserDialog::initView() {
 
 	m_rangeList = new KListView(plainPage());
 	m_rangeList->addColumn(i18n("Search range"));
-	m_rangeList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+	m_rangeList->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 	m_rangeList->setFullWidth(true);
 	m_rangeList->setSorting(0, true);
 	m_rangeList->header()->setClickEnabled(false);
@@ -123,7 +123,7 @@ void CRangeChooserDialog::initView() {
 	grid->addWidget(m_nameEdit,0,4);
 
 	label = new TQLabel(i18n("Edit current search range:"), plainPage());
-	label->setFixedSize(label->tqsizeHint());
+	label->setFixedSize(label->sizeHint());
 	m_rangeEdit = new TQTextEdit(plainPage());
 	m_rangeEdit->setTextFormat(TQt::PlainText);
 	grid->addMultiCellWidget(label,1,1,3,4);

bibletime/frontend/searchdialog/csearchanalysis.cpp

@@ -80,19 +80,19 @@ CSearchAnalysisDialog::~CSearchAnalysisDialog() {}
 
 /** Initializes this dialog. */
 void CSearchAnalysisDialog::initView() {
-	TQVBoxLayout* tqlayout = new TQVBoxLayout(plainPage(),0);
+	TQVBoxLayout* layout = new TQVBoxLayout(plainPage(),0);
 
 	TQPushButton* button = new TQPushButton(plainPage(), "button");
 	button->setIconSet(SmallIconSet("filesave"));
 	button->setText(i18n("Save search analysis as HTML"));
-	button->setFixedSize(button->tqsizeHint());
-	tqlayout->addWidget(button);
-	tqlayout->addSpacing(10);
+	button->setFixedSize(button->sizeHint());
+	layout->addWidget(button);
+	layout->addSpacing(10);
 
 	m_analysis = new CSearchAnalysis(TQT_TQOBJECT(plainPage()));
 	m_analysisView = new CSearchAnalysisView(m_analysis, plainPage());
 	m_analysisView->show();
-	tqlayout->addWidget(m_analysisView);
+	layout->addWidget(m_analysisView);
 
 	connect(button, TQT_SIGNAL(clicked()), m_analysis, TQT_SLOT(saveAsHTML()));
 }
@@ -160,7 +160,7 @@ void CSearchAnalysis::analyse(ListCSwordModuleInfo modules) {
 		moduleIndex = 0;
 		ListCSwordModuleInfo::iterator end_it = m_moduleList.end();
 		for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) {
-			KApplication::kApplication()->tqprocessEvents( 10 ); //10 ms only
+			KApplication::kApplication()->processEvents( 10 ); //10 ms only
 			if (!m_lastPosList.contains(*it)) {
 				m_lastPosList.insert(*it,0);
 			}
@@ -381,7 +381,7 @@ int CSearchAnalysisItem::width() {
 
 /** Returns the tooltip for this item. */
 const TQString CSearchAnalysisItem::getToolTip() {
-	TQString ret = TQString("<center><b>%1</b></center><hr/>").tqarg(m_bookName);
+	TQString ret = TQString("<center><b>%1</b></center><hr/>").arg(m_bookName);
 	ret += "<table cellspacing=\"0\" cellpadding=\"3\" width=\"100%\" height=\"100%\" align=\"center\">";
 
 	//ToDo: Fix that loop
@@ -395,10 +395,10 @@ const TQString CSearchAnalysisItem::getToolTip() {
 
 		ret.append(
 			TQString("<tr bgcolor=\"white\"><td><b><font color=\"#%1\">%2</font></b></td><td>%3 (%4%)</td></tr>")
-			.tqarg(TQString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue()))
-			.tqarg(info ? info->name() : TQString())
-			.tqarg( m_resultCountArray[i] )
-			.tqarg( (info && m_resultCountArray[i])? ((double)m_resultCountArray[i] / (double)info->searchResult().Count())*(double)100 : 0.0, 0, 'g', 2)
+			.arg(TQString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue()))
+			.arg(info ? info->name() : TQString())
+			.arg( m_resultCountArray[i] )
+			.arg( (info && m_resultCountArray[i])? ((double)m_resultCountArray[i] / (double)info->searchResult().Count())*(double)100 : 0.0, 0, 'g', 2)
 		);
 		++i;
 	}
@@ -415,14 +415,14 @@ CSearchAnalysisView::CSearchAnalysisView(TQCanvas* canvas, TQWidget* parent)
 : TQCanvasView(canvas, parent) {
 	setFocusPolicy(TQ_WheelFocus);
 	m_toolTip = new ToolTip(this);
-	resize(tqsizeHint());
+	resize(sizeHint());
 }
 
-/** Returns the tqsizeHint for this view */
-TQSize CSearchAnalysisView::tqsizeHint() {
+/** Returns the sizeHint for this view */
+TQSize CSearchAnalysisView::sizeHint() {
 	if ( parentWidget() )
-		return parentWidget()->tqsizeHint();
-	return TQCanvasView::tqsizeHint();
+		return parentWidget()->sizeHint();
+	return TQCanvasView::sizeHint();
 }
 
 /** No descriptions */
@@ -514,7 +514,7 @@ void CSearchAnalysisLegendItem::draw (TQPainter& painter) {
 /** No descriptions */
 void CSearchAnalysis::saveAsHTML() {
 	const TQString file = KFileDialog::getSaveFileName(TQString(),
-						 TQString("*.html | %1").tqarg(i18n("HTML files")),
+						 TQString("*.html | %1").arg(i18n("HTML files")),
 						 0,
 						 i18n("Save Search Analysis"));
 	if (file.isNull()) {

bibletime/frontend/searchdialog/csearchanalysis.h

@@ -187,11 +187,11 @@ public:
 	*/
 	CSearchAnalysisView(TQCanvas* canvas, TQWidget* parent);
 	/**
-	* Returns the tqsizeHint for this view
+	* Returns the sizeHint for this view
 	* We give back the size of the parent widgetas default.
-	* This is a reimplementation from TQCanvasView::tqsizeHint().
+	* This is a reimplementation from TQCanvasView::sizeHint().
 	*/
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 	/**
 	* Returns the item at position p.
 	* If there no item at that point return 0.

bibletime/frontend/searchdialog/csearchdialog.cpp

@@ -172,7 +172,7 @@ const ListCSwordModuleInfo CSearchDialog::modules() {
 /** Sets the list of modules for the search. */
 void CSearchDialog::setModules( const ListCSwordModuleInfo modules ) {
 	m_searchOptionsPage->setModules(modules);
-	resize( tqsizeHint() );
+	resize( sizeHint() );
 }
 
 /** Returns the search text which is set currently. */

bibletime/frontend/searchdialog/csearchdialogpages.cpp

@@ -73,7 +73,7 @@ void StrongsResultClass::initStrongsResults(void) {
 	count = result.Count();
 	if (!count)
 		return;
-	KApplication::kApplication()->tqprocessEvents( 1 ); //1 ms only
+	KApplication::kApplication()->processEvents( 1 ); //1 ms only
 	srList.clear();
 	// for whatever reason the text "Parsing...translations." does not appear.
 	// this is not critical but the text is necessary to get the dialog box
@@ -85,7 +85,7 @@ void StrongsResultClass::initStrongsResults(void) {
 	progress->raise();
 	for (index = 0; index < count; index++){
 		progress->progressBar()->setProgress( int( (index*100) / count ) );
- 		KApplication::kApplication()->tqprocessEvents( 1 ); //1 ms only
+ 		KApplication::kApplication()->processEvents( 1 ); //1 ms only
 
 		key = TQString::fromUtf8(result.GetElement(index)->getText());
 		text = render.renderSingleKey(key, modules, settings);
@@ -662,12 +662,12 @@ void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) {
 			m_modules.append( *it );
 			t.append( (*it)->name() );
 			if (*it != modules.last()) {
-				t += TQString::tqfromLatin1(", "); // so that it will become a readable list (WLC, LXX, GerLut...)
+				t += TQString::fromLatin1(", "); // so that it will become a readable list (WLC, LXX, GerLut...)
 			}
 		}
 	};
 	m_modulesLabel->setText(t);
-	emit( sigSetSearchButtontqStatus( (modules.count() != 0) ) );
+	emit( sigSetSearchButtonStatus( (modules.count() != 0) ) );
 }
 
 /** Opens the modules chooser dialog. */

bibletime/frontend/searchdialog/csearchdialogpages.h

@@ -160,8 +160,8 @@ public:
 	*/
 	void setSearchResult(ListCSwordModuleInfo modules);
 	
-	TQSize tqsizeHint() const { return baseSize(); }
-	TQSize tqminimumSizeHint() const { return tqminimumSize(); }
+	TQSize sizeHint() const { return baseSize(); }
+	TQSize minimumSizeHint() const { return minimumSize(); }
 
 public slots: // Public slots
 	/**
@@ -241,8 +241,8 @@ public:
 	*/
 	//const CSwordModuleSearch::scopeType scopeType();
 
-	TQSize tqsizeHint() const { return baseSize(); }
-	TQSize tqminimumSizeHint() const { return tqminimumSize(); }
+	TQSize sizeHint() const { return baseSize(); }
+	TQSize minimumSizeHint() const { return minimumSize(); }
     bool hasSearchScope();
 
 private:
@@ -285,7 +285,7 @@ protected slots: // Protected slots
 	void syntaxHelp();
 
 signals:
-	void sigSetSearchButtontqStatus(bool);
+	void sigSetSearchButtonStatus(bool);
 };
 
 	} //end of namespace Search::Options

bibletime/frontend/searchdialog/searchoptionsform.cpp

@@ -28,7 +28,7 @@ SearchOptionsForm::SearchOptionsForm( TQWidget* parent, const char* name, WFlags
 {
     if ( !name )
 	setName( "SearchOptionsForm" );
-    tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth() ) );
+    setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth() ) );
     setMinimumSize( TQSize( 260, 130 ) );
     setBaseSize( TQSize( 420, 150 ) );
     SearchOptionsFormLayout = new TQHBoxLayout( this, 0, 3, "SearchOptionsFormLayout"); 
@@ -36,13 +36,13 @@ SearchOptionsForm::SearchOptionsForm( TQWidget* parent, const char* name, WFlags
     searchGroupBox = new TQGroupBox( this, "searchGroupBox" );
     searchGroupBox->setMargin( 0 );
     searchGroupBox->setColumnLayout(0, Qt::Vertical );
-    searchGroupBox->tqlayout()->setSpacing( 3 );
-    searchGroupBox->tqlayout()->setMargin( 6 );
-    searchGroupBoxLayout = new TQGridLayout( searchGroupBox->tqlayout() );
-    searchGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
+    searchGroupBox->layout()->setSpacing( 3 );
+    searchGroupBox->layout()->setMargin( 6 );
+    searchGroupBoxLayout = new TQGridLayout( searchGroupBox->layout() );
+    searchGroupBoxLayout->setAlignment( TQt::AlignTop );
 
     m_searchTextLabel = new TQLabel( searchGroupBox, "m_searchTextLabel" );
-    m_searchTextLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_searchTextLabel->sizePolicy().hasHeightForWidth() ) );
+    m_searchTextLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_searchTextLabel->sizePolicy().hasHeightForWidth() ) );
 
     searchGroupBoxLayout->addWidget( m_searchTextLabel, 0, 0 );
 
@@ -59,17 +59,17 @@ SearchOptionsForm::SearchOptionsForm( TQWidget* parent, const char* name, WFlags
     searchGroupBoxLayout->addWidget( m_chooseRangeButton, 2, 2 );
 
     m_searchScopeLabel = new TQLabel( searchGroupBox, "m_searchScopeLabel" );
-    m_searchScopeLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_searchScopeLabel->sizePolicy().hasHeightForWidth() ) );
+    m_searchScopeLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_searchScopeLabel->sizePolicy().hasHeightForWidth() ) );
 
     searchGroupBoxLayout->addWidget( m_searchScopeLabel, 2, 0 );
 
     m_rangeChooserCombo = new KComboBox( FALSE, searchGroupBox, "m_rangeChooserCombo" );
-    m_rangeChooserCombo->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_rangeChooserCombo->sizePolicy().hasHeightForWidth() ) );
+    m_rangeChooserCombo->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_rangeChooserCombo->sizePolicy().hasHeightForWidth() ) );
 
     searchGroupBoxLayout->addWidget( m_rangeChooserCombo, 2, 1 );
 
     m_searchTextCombo = new KHistoryCombo( searchGroupBox, "m_searchTextCombo" );
-    m_searchTextCombo->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_searchTextCombo->sizePolicy().hasHeightForWidth() ) );
+    m_searchTextCombo->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_searchTextCombo->sizePolicy().hasHeightForWidth() ) );
     m_searchTextCombo->setFocusPolicy( KHistoryCombo::WheelFocus );
     m_searchTextCombo->setSizeLimit( 25 );
     m_searchTextCombo->setInsertionPolicy( KHistoryCombo::AtBottom );
@@ -78,14 +78,14 @@ SearchOptionsForm::SearchOptionsForm( TQWidget* parent, const char* name, WFlags
     searchGroupBoxLayout->addWidget( m_searchTextCombo, 0, 1 );
 
     m_modulesLabel = new TQLabel( searchGroupBox, "m_modulesLabel" );
-    m_modulesLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_modulesLabel->sizePolicy().hasHeightForWidth() ) );
+    m_modulesLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_modulesLabel->sizePolicy().hasHeightForWidth() ) );
     m_modulesLabel->setTextFormat( TQLabel::RichText );
-    m_modulesLabel->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
+    m_modulesLabel->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
 
     searchGroupBoxLayout->addMultiCellWidget( m_modulesLabel, 1, 1, 0, 1 );
     SearchOptionsFormLayout->addWidget( searchGroupBox );
     languageChange();
-    resize( TQSize(648, 130).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(648, 130).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 

bibletime/frontend/searchdialog/searchoptionsform.ui

@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>260</width>
             <height>130</height>
@@ -180,7 +180,7 @@
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>

bibletime/frontend/searchdialog/searchresultsform.cpp

@@ -29,7 +29,7 @@ SearchResultsForm::SearchResultsForm( TQWidget* parent, const char* name, WFlags
 {
     if ( !name )
 	setName( "SearchResultsForm" );
-    tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
+    setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
     setMinimumSize( TQSize( 300, 220 ) );
     setBaseSize( TQSize( 440, 290 ) );
     SearchResultsFormLayout = new TQVBoxLayout( this, 0, 3, "SearchResultsFormLayout"); 
@@ -58,12 +58,12 @@ SearchResultsForm::SearchResultsForm( TQWidget* parent, const char* name, WFlags
     rightSideBox->addLayout( buttonLayout );
 
     m_displayFrame = new TQFrame( displaySplitter, "m_displayFrame" );
-    m_displayFrame->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_displayFrame->sizePolicy().hasHeightForWidth() ) );
+    m_displayFrame->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_displayFrame->sizePolicy().hasHeightForWidth() ) );
     m_displayFrame->setFrameShape( TQFrame::NoFrame );
     m_displayFrame->setFrameShadow( TQFrame::Plain );
     SearchResultsFormLayout->addWidget( displaySplitter );
     languageChange();
-    resize( TQSize(300, 220).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(300, 220).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 

bibletime/frontend/searchdialog/searchresultsform.ui

@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>300</width>
             <height>220</height>
@@ -49,7 +49,7 @@
             <property name="name">
                 <cstring>displaySplitter</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>134</width>
                     <height>44</height>
@@ -116,7 +116,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>10</width>
                                         <height>20</height>

bibletime/util/ctoolclass.cpp

@@ -74,9 +74,9 @@ bool CToolClass::savePlainFile( const TQString& filename, const TQString& text,
 
 	if (saveFile.exists()) {
 		if (!forceOverwrite && KMessageBox::warningYesNo(0,
-				TQString::tqfromLatin1("<qt><B>%1</B><BR>%2</qt>")
-				.tqarg( i18n("The file already exists.") )
-				.tqarg( i18n("Do you want to overwrite it?")
+				TQString::fromLatin1("<qt><B>%1</B><BR>%2</qt>")
+				.arg( i18n("The file already exists.") )
+				.arg( i18n("Do you want to overwrite it?")
 					)
 														) == KMessageBox::No
 		   ) {
@@ -95,9 +95,9 @@ bool CToolClass::savePlainFile( const TQString& filename, const TQString& text,
 		ret = true;
 	}
 	else {
-		KMessageBox::error(0, TQString::tqfromLatin1("<qt>%1<BR><B>%2</B></qt>")
-						   .tqarg( i18n("The file couldn't be saved.") )
-						   .tqarg( i18n("Please check permissions etc.")));
+		KMessageBox::error(0, TQString::fromLatin1("<qt>%1<BR><B>%2</B></qt>")
+						   .arg( i18n("The file couldn't be saved.") )
+						   .arg( i18n("Please check permissions etc.")));
 		saveFile.close();
 		ret = false;
 	}
@@ -160,7 +160,7 @@ TQPixmap CToolClass::getIconForModule( CSwordModuleInfo* module_info ) {
 }
 
 TQLabel* CToolClass::explanationLabel(TQWidget* parent, const TQString& heading, const TQString& text ) {
-	TQLabel* label = new TQLabel( TQString::tqfromLatin1("<B>%1</B><BR>%2").tqarg(heading).tqarg(text),parent );
+	TQLabel* label = new TQLabel( TQString::fromLatin1("<B>%1</B><BR>%2").arg(heading).arg(text),parent );
 	label->setAutoResize(true);
 	label->setMargin(1);
 	label->setFrameStyle(TQFrame::Box | TQFrame::Plain);
@@ -197,20 +197,20 @@ TQString CToolClass::moduleToolTip(CSwordModuleInfo* module) {
 
 	TQString text;
 
-	text = TQString("<b>%1</b> ").tqarg( module->name() )
-		   + ((module->category() == CSwordModuleInfo::Cult) ? TQString::tqfromLatin1("<small><b>%1</b></small><br>").tqarg(i18n("Take care, this work contains cult / questionable material!")) : TQString());
+	text = TQString("<b>%1</b> ").arg( module->name() )
+		   + ((module->category() == CSwordModuleInfo::Cult) ? TQString::fromLatin1("<small><b>%1</b></small><br>").arg(i18n("Take care, this work contains cult / questionable material!")) : TQString());
 
 	text += TQString("<small>(") + module->config(CSwordModuleInfo::Description) + TQString(")</small><hr>");
 
-	text += i18n("Language") + TQString(": %1<br>").tqarg( module->language()->translatedName() );
+	text += i18n("Language") + TQString(": %1<br>").arg( module->language()->translatedName() );
 
 	if (module->isEncrypted()) {
 		text += i18n("Unlock key") + TQString(": %1<br>")
-				.tqarg(!module->config(CSwordModuleInfo::CipherKey).isEmpty() ? module->config(CSwordModuleInfo::CipherKey) : TQString("<font COLOR=\"red\">%1</font>").tqarg(i18n("not set")));
+				.arg(!module->config(CSwordModuleInfo::CipherKey).isEmpty() ? module->config(CSwordModuleInfo::CipherKey) : TQString("<font COLOR=\"red\">%1</font>").arg(i18n("not set")));
 	}
 
 	if (module->hasVersion()) {
-		text += i18n("Version") + TQString(": %1<br>").tqarg( module->config(CSwordModuleInfo::ModuleVersion) );
+		text += i18n("Version") + TQString(": %1<br>").arg( module->config(CSwordModuleInfo::ModuleVersion) );
 	}
 
 	TQString options;
@@ -218,7 +218,7 @@ TQString CToolClass::moduleToolTip(CSwordModuleInfo* module) {
 	for (opts = CSwordModuleInfo::filterTypesMIN; opts <= CSwordModuleInfo::filterTypesMAX; ++opts) {
 		if (module->has( static_cast<CSwordModuleInfo::FilterTypes>(opts) )) {
 			if (!options.isEmpty()) {
-				options += TQString::tqfromLatin1(", ");
+				options += TQString::fromLatin1(", ");
 			}
 
 			options += CSwordBackend::translatedOptionName(
@@ -228,10 +228,10 @@ TQString CToolClass::moduleToolTip(CSwordModuleInfo* module) {
 	}
 
 	if (!options.isEmpty()) {
-		text += i18n("Options") + TQString::tqfromLatin1(": <small>") + options + TQString("</small>");
+		text += i18n("Options") + TQString::fromLatin1(": <small>") + options + TQString("</small>");
 	}
 
-	if (text.right(4) == TQString::tqfromLatin1("<br>")) {
+	if (text.right(4) == TQString::fromLatin1("<br>")) {
 		text = text.left(text.length()-4);
 	}
 

clucene.m4

@@ -28,7 +28,8 @@ AC_ARG_ENABLE(static-clucene,
 
 dnl try to find CLucene library files
 AC_MSG_CHECKING([for CLucene library files])
-ac_clucene_library_dirs="$ac_clucene_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/local/lib"
+clucene_multiarch_libs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`"
+ac_clucene_library_dirs="$ac_clucene_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/local/lib $clucene_multiarch_libs"
 
 if test "x$ac_static_clucene" = "xYES"; then
 	SEARCH_LIBS="libclucene.a";
@@ -40,13 +41,26 @@ fi
 AC_CACHE_VAL(ac_cv_clucene_libdir, AC_FIND_FILE($SEARCH_LIBS, $ac_clucene_library_dirs, ac_cv_clucene_libdir))
 
 if test "x$ac_cv_clucene_libdir" = "xNO"; then
-  AC_MSG_ERROR(CLucene library not found. Try to use configure with --with-clucene-dir=/path/to/clucene);
+  AC_MSG_CHECKING([for CLucene 2.x library files])
+  SEARCH_LIBS="libclucene-shared.so libclucene-shared.so.1";
+  AC_CACHE_VAL(ac_cv_clucene2_libdir, AC_FIND_FILE($SEARCH_LIBS, $ac_clucene_library_dirs, ac_cv_clucene_libdir))
+
+  if test "x$ac_cv_clucene2_libdir" = "xNO"; then
+    AC_MSG_ERROR(CLucene library not found. Try to use configure with --with-clucene-dir=/path/to/clucene);
+  fi
+else
+  ac_cv_clucene2_libdir="NO"
 fi
 
 if test "x$ac_static_clucene" = "xYES"; then
 	LIB_CLUCENE="$ac_cv_clucene_libdir/libclucene.a";
 else
-	LIB_CLUCENE="-lclucene";
+	if test "x$ac_cv_clucene2_libdir" = "xNO"; then
+		LIB_CLUCENE="-lclucene";
+	else
+		CXXFLAGS="$CXXFLAGS -DCLUCENE_V2"
+		LIB_CLUCENE="-lclucene-core -lclucene-shared";
+	fi
 fi
 
 AC_SUBST(CLUCENE_LIBRARY_PATH)
@@ -119,7 +133,7 @@ int main(int argc, char* argv[[]]) {
 EOF
 
 
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
 	if test -x conftest; then
 		eval ac_cv_installed_clucene_version=`./conftest 2>&5`

configure.in.in

@@ -18,7 +18,7 @@ KDE_SET_PREFIX
 KDE_USE_QT(3.0)
 
 dnl generate the config header
-AM_CONFIG_HEADER([config.h]) dnl at the distribution this done
+AC_CONFIG_HEADER([config.h]) dnl at the distribution this done
 
 dnl Checks for programs.
 AC_CHECK_COMPILERS

sword.m4

@@ -119,7 +119,7 @@ int main(int argc, char** argv) {
 EOF
 
 
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
 	if test -x conftest; then
 		eval ac_cv_installed_sword_version=`./conftest 2>&5`
@@ -192,7 +192,7 @@ int main(int argc, char** argv) {
 }
 EOF
 
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
 	if test -x conftest; then
 		eval ac_cv_sword_recent_version=`./conftest $1 2>&5`