TQt4 port Bibletime

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/bibletime@1232459 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
index 3d8105f..30d5e21 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
@@ -16,7 +16,7 @@
 
 #include "util/cresmgr.h"
 
-//Qt includes
+//TQt includes
 #include <tqstring.h>
 #include <tqtooltip.h>
 #include <tqdict.h>
@@ -27,9 +27,9 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 
-CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name )
-: KToolBarButton(iconName(), id, parent, name),
-m_id(id), m_popup(0), m_moduleChooserBar(parent) {
+CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *tqparent, const char *name )
+: KToolBarButton(iconName(), id, tqparent, name),
+m_id(id), m_popup(0), m_moduleChooserBar(tqparent) {
 	m_moduleType = type;
 	m_module = useModule;
 	if (!m_module) {
@@ -85,7 +85,7 @@ CSwordModuleInfo* CModuleChooserButton::module() {
 		for (unsigned int i = 0; i < popup->count(); i++) {
 			if ( m_popup->isItemChecked(popup->idAt(i)) ) {
 				TQString mod = popup->text(popup->idAt(i)).remove('&');
-				return backend()->findModuleByName( mod.left(mod.find(" ")) );
+				return backend()->findModuleByName( mod.left(mod.tqfind(" ")) );
 			}
 		}
 
@@ -190,14 +190,14 @@ void CModuleChooserButton::populateMenu() {
 		TQString lang = (*it)->language()->translatedName();
 
 		if (lang.isEmpty()) {
-			//lang = TQString::fromLatin1("xx"); //unknown language -- do not use English as default!!
+			//lang = TQString::tqfromLatin1("xx"); //unknown language -- do not use English as default!!
 			lang = (*it)->language()->abbrev();
 			if (lang.isEmpty()) {
 				lang = "xx";
 			}
 		}
 
-		if (languages.find( lang ) == languages.end() ) { //this lang was not yet added
+		if (languages.tqfind( lang ) == languages.end() ) { //this lang was not yet added
 			languages += lang;
 
 			KPopupMenu* menu = new KPopupMenu;
@@ -222,7 +222,7 @@ void CModuleChooserButton::populateMenu() {
 		}
 
 		TQString name((*it)->name());
-		name.append(" ").append((*it)->isLocked() ? i18n("[locked]") : TQString::null);
+		name.append(" ").append((*it)->isLocked() ? i18n("[locked]") : TQString());
 
 		const int id = langdict[lang]->insertItem( name );
 		if ( m_module && (*it)->name() == m_module->name()) {
@@ -258,14 +258,14 @@ void CModuleChooserButton::updateMenuItems() {
 
 		for (unsigned int i = 0; i < popup->count(); i++) {
 			moduleName = popup->text(popup->idAt(i)).remove('&');
-			module = backend()->findModuleByName( moduleName.left(moduleName.findRev(" ")) );
+			module = backend()->findModuleByName( moduleName.left(moduleName.tqfindRev(" ")) );
 
  			Q_ASSERT(module);
 // 			if (!module) {
 // 				qWarning("Can't find module with name %s", moduleName.latin1());
 // 			}
 
-			bool alreadyChosen = chosenModules.contains( module );
+			bool alreadyChosen = chosenModules.tqcontains( module );
 			if (m_module) {
 				alreadyChosen = alreadyChosen && (m_module->name() != moduleName);
 			}