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, 12 insertions, 12 deletions

diff --git a/bibletime/frontend/searchdialog/cmodulechooser.cpp b/bibletime/frontend/searchdialog/cmodulechooser.cpp
index ea6d8fc..2bb79fd 100644
--- a/bibletime/frontend/searchdialog/cmodulechooser.cpp
+++ b/bibletime/frontend/searchdialog/cmodulechooser.cpp
@@ -19,7 +19,7 @@
 #include "util/cresmgr.h"
 #include "util/ctoolclass.h"
 
-//Qt includes
+//TQt includes
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqptrlist.h>
@@ -48,7 +48,7 @@ namespace Search {
 /****************************/
 /****************************/
 
-CModuleChooser::ModuleCheckBoxItem::ModuleCheckBoxItem(TQListViewItem* item, CSwordModuleInfo* module) : TQCheckListItem(item, TQString::null, TQCheckListItem::CheckBox) {
+CModuleChooser::ModuleCheckBoxItem::ModuleCheckBoxItem(TQListViewItem* item, CSwordModuleInfo* module) : TQCheckListItem(item, TQString(), TQCheckListItem::CheckBox) {
 	m_module = module;
 	setText(0,m_module->name());
 };
@@ -66,7 +66,7 @@ CSwordModuleInfo* const CModuleChooser::ModuleCheckBoxItem::module() const {
 /****************************/
 /****************************/
 
-CModuleChooser::CModuleChooser(TQWidget* parent) : KListView(parent) {
+CModuleChooser::CModuleChooser(TQWidget* tqparent) : KListView(tqparent) {
 	initView();
 	initTree();
 }
@@ -120,7 +120,7 @@ void CModuleChooser::initTree() {
 
 	while (ok) {
 		ListCSwordModuleInfo modsForType;
-		TQString typeFolderCaption = TQString::null;
+		TQString typeFolderCaption = TQString();
 		incType = false;
 		if (static_cast<CSwordModuleInfo::ModuleType>(type) == CSwordModuleInfo::Lexicon) {
 			if (!addedLexs) {
@@ -136,7 +136,7 @@ void CModuleChooser::initTree() {
 				};
 
 				addedLexs = true;
-				typeFolderCaption = TQString::null;
+				typeFolderCaption = TQString();
 			}
 			else if (!addedDevotionals) {
 				//         for (mods.first(); mods.current(); mods.next()) {
@@ -186,7 +186,7 @@ void CModuleChooser::initTree() {
 		//     for (modsForType.first(); modsForType.current(); modsForType.next()) {
 		ListCSwordModuleInfo::iterator end_it = modsForType.end();
 		for (ListCSwordModuleInfo::iterator it(modsForType.begin()); it != end_it; ++it) {
-			if ( !langs.contains(TQString( (*it)->module()->Lang() ))) {
+			if ( !langs.tqcontains(TQString( (*it)->module()->Lang() ))) {
 				langs.append( (*it)->module()->Lang() );
 			}
 		};
@@ -205,7 +205,7 @@ void CModuleChooser::initTree() {
 		};
 
 
-		TQString language = TQString::null;
+		TQString language = TQString();
 		CLanguageMgr* langMgr = languageMgr();
 		for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
 			language = langMgr->languageForAbbrev(*it)->translatedName();
@@ -256,7 +256,7 @@ void CModuleChooser::setModules( ListCSwordModuleInfo modules ) {
 	TQListViewItemIterator it( this );
 	for ( ; it.current(); ++it ) {
 		if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) {
-			i->setOn(modules.contains(i->module())); //set the status for the module checkbox item
+			i->setOn(modules.tqcontains(i->module())); //set the status for the module checkbox item
 			//      if (i->isOn()) { //if it's checked, show the item
 			//        qWarning("show item!");
 			//        ensureItemVisible(i);
@@ -267,8 +267,8 @@ void CModuleChooser::setModules( ListCSwordModuleInfo modules ) {
 
 /****************************/
 
-CModuleChooserDialog::CModuleChooserDialog( TQWidget* parentDialog, ListCSwordModuleInfo modules ) :
-KDialogBase(Plain, i18n("Choose work(s)"), Ok, Ok, parentDialog, "CModuleChooser", false, true) {
+CModuleChooserDialog::CModuleChooserDialog( TQWidget* tqparentDialog, ListCSwordModuleInfo modules ) :
+KDialogBase(Plain, i18n("Choose work(s)"), Ok, Ok, tqparentDialog, "CModuleChooser", false, true) {
 	initView();
 	initConnections();
 
@@ -283,10 +283,10 @@ void CModuleChooserDialog::initView() {
 	setButtonOKText(i18n("Use chosen work(s)"));
 
 	TQFrame* page = plainPage();
-	TQHBoxLayout* layout = new TQHBoxLayout(page);
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(page);
 	m_moduleChooser = new CModuleChooser(page);
 	m_moduleChooser->setMinimumSize(320,400);
-	layout->addWidget(m_moduleChooser);
+	tqlayout->addWidget(m_moduleChooser);
 }
 
 /** Initializes the connections of this dialog. */