Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

46 files changed, 328 insertions, 328 deletions

diff --git a/bibletime/bibletime.h b/bibletime/bibletime.h
index ca89a2e..2553375 100644
--- a/bibletime/bibletime.h
+++ b/bibletime/bibletime.h
@@ -212,7 +212,7 @@ protected: // Protected methods
 	*/
 	void initMenubar();
 	/**
-	* Initializes the TQT_SIGNAL / TQT_SLOT connections
+	* Initializes the signal / slot connections
 	*/
 	void initConnections();
 	/**
diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
index bd2b213..450008c 100644
--- a/bibletime/bibletime_init.cpp
+++ b/bibletime/bibletime_init.cpp
@@ -104,7 +104,7 @@ void BibleTime::initActions() {
 	TDEStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
 	TDEAction* action = 0;
 
-	action = KStdAction::quit(kapp, TQT_SLOT( quit() ), actionCollection());
+	action = KStdAction::quit(kapp, TQ_SLOT( quit() ), actionCollection());
 	action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
 
 	#if TDE_VERSION_MINOR < 1
@@ -115,7 +115,7 @@ void BibleTime::initActions() {
 	action = new TDEAction(i18n("Search in &open work(s)"),
 						 CResMgr::mainMenu::mainIndex::search::icon,
 						 CResMgr::mainMenu::mainIndex::search::accel,
-						 this, TQT_SLOT(slotSearchModules()), actionCollection(),
+						 this, TQ_SLOT(slotSearchModules()), actionCollection(),
 						 CResMgr::mainMenu::mainIndex::search::actionName
 						);
 	action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip );
@@ -128,7 +128,7 @@ void BibleTime::initActions() {
 	action = new TDEAction(i18n("Search in standard &Bible"),
 						 CResMgr::mainMenu::mainIndex::searchdefaultbible::icon,
 						 CResMgr::mainMenu::mainIndex::searchdefaultbible::accel,
-						 this, TQT_SLOT(slotSearchDefaultBible()), actionCollection(),
+						 this, TQ_SLOT(slotSearchDefaultBible()), actionCollection(),
 						 CResMgr::mainMenu::mainIndex::searchdefaultbible::actionName
 						);
 	action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip );
@@ -138,7 +138,7 @@ void BibleTime::initActions() {
 	action->plugAccel( accel() );
 	#endif
 
-	m_viewToolbar_action = KStdAction::showToolbar(this, TQT_SLOT( slotToggleToolbar() ), actionCollection());
+	m_viewToolbar_action = KStdAction::showToolbar(this, TQ_SLOT( slotToggleToolbar() ), actionCollection());
 	m_viewToolbar_action->setToolTip( CResMgr::mainMenu::view::showToolBar::tooltip );
 
 	#if TDE_VERSION_MINOR < 1
@@ -150,7 +150,7 @@ void BibleTime::initActions() {
 	m_viewMainIndex_action = new TDEToggleAction(i18n("&Show bookshelf"),
 							 CResMgr::mainMenu::view::showMainIndex::icon,
 							 CResMgr::mainMenu::view::showMainIndex::accel,
-							 this, TQT_SLOT(slotToggleMainIndex()), actionCollection(),
+							 this, TQ_SLOT(slotToggleMainIndex()), actionCollection(),
 							 CResMgr::mainMenu::view::showMainIndex::actionName);
 	m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip );
 
@@ -162,7 +162,7 @@ void BibleTime::initActions() {
 	m_viewInfoDisplay_action = new TDEToggleAction(i18n("Show &mag"),
 							   CResMgr::mainMenu::view::showInfoDisplay::icon,
 							   CResMgr::mainMenu::view::showInfoDisplay::accel,
-							   this, TQT_SLOT(slotToggleInfoDisplay()), actionCollection(),
+							   this, TQ_SLOT(slotToggleInfoDisplay()), actionCollection(),
 							   CResMgr::mainMenu::view::showInfoDisplay::actionName);
 	m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showInfoDisplay::tooltip );
 
@@ -171,7 +171,7 @@ void BibleTime::initActions() {
 	m_viewInfoDisplay_action->plugAccel( accel() );
 	#endif
 
-	action = KStdAction::preferences(this, TQT_SLOT( slotSettingsOptions() ), actionCollection());
+	action = KStdAction::preferences(this, TQ_SLOT( slotSettingsOptions() ), actionCollection());
 	action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip );
 
 	#if TDE_VERSION_MINOR < 1
@@ -182,7 +182,7 @@ void BibleTime::initActions() {
 	action = new TDEAction(i18n("Bookshelf &Manager"),
 						 CResMgr::mainMenu::settings::swordSetupDialog::icon,
 						 CResMgr::mainMenu::settings::swordSetupDialog::accel,
-						 this, TQT_SLOT( slotSwordSetupDialog() ), actionCollection(),
+						 this, TQ_SLOT( slotSwordSetupDialog() ), actionCollection(),
 						 CResMgr::mainMenu::settings::swordSetupDialog::actionName
 						);
 	action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip );
@@ -198,7 +198,7 @@ void BibleTime::initActions() {
 			 KStdAction::stdName(KStdAction::ConfigureToolbars))
 		);
 	}
-	action = KStdAction::configureToolbars(this, TQT_SLOT( slotSettingsToolbar() ), actionCollection());
+	action = KStdAction::configureToolbars(this, TQ_SLOT( slotSettingsToolbar() ), actionCollection());
 	action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip );
 	#if TDE_VERSION_MINOR < 1
 
@@ -214,7 +214,7 @@ void BibleTime::initActions() {
 	m_windowManualMode_action = new TDEToggleAction(i18n("&Manual mode"),
 								CResMgr::mainMenu::window::arrangementMode::manual::icon,
 								CResMgr::mainMenu::window::arrangementMode::manual::accel,
-								this, TQT_SLOT(slotManualArrangementMode()), actionCollection(),
+								this, TQ_SLOT(slotManualArrangementMode()), actionCollection(),
 								CResMgr::mainMenu::window::arrangementMode::manual::actionName
 												 );
 	m_windowManualMode_action->setToolTip(
@@ -231,7 +231,7 @@ void BibleTime::initActions() {
 	m_windowAutoTileVertical_action = new TDEToggleAction(i18n("Auto-tile &vertically"),
 									  CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon,
 									  CResMgr::mainMenu::window::arrangementMode::autoTileVertical::accel,
-									  this, TQT_SLOT(slotAutoTileVertical()), actionCollection(),
+									  this, TQ_SLOT(slotAutoTileVertical()), actionCollection(),
 									  CResMgr::mainMenu::window::arrangementMode::autoTileVertical::actionName
 													   );
 	m_windowAutoTileVertical_action->setToolTip(
@@ -248,7 +248,7 @@ void BibleTime::initActions() {
 	m_windowAutoTileHorizontal_action = new TDEToggleAction(i18n("Auto-tile &horizontally"),
 										CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon,
 										CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::accel,
-										this, TQT_SLOT(slotAutoTileHorizontal()), actionCollection(),
+										this, TQ_SLOT(slotAutoTileHorizontal()), actionCollection(),
 										CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::actionName
 														 );
 	m_windowAutoTileHorizontal_action->setToolTip(
@@ -265,7 +265,7 @@ void BibleTime::initActions() {
 	m_windowAutoCascade_action  = new TDEToggleAction(i18n("Auto-&cascade"),
 								  CResMgr::mainMenu::window::arrangementMode::autoCascade::icon,
 								  CResMgr::mainMenu::window::arrangementMode::autoCascade::accel,
-								  this, TQT_SLOT(slotAutoCascade()), actionCollection(),
+								  this, TQ_SLOT(slotAutoCascade()), actionCollection(),
 								  CResMgr::mainMenu::window::arrangementMode::autoCascade::actionName
 												   );
 	m_windowAutoCascade_action->setToolTip(
@@ -281,7 +281,7 @@ void BibleTime::initActions() {
 	m_windowCascade_action = new TDEAction(i18n("&Cascade"),
 										 CResMgr::mainMenu::window::cascade::icon,
 										 CResMgr::mainMenu::window::cascade::accel,
-										 this, TQT_SLOT(slotCascade()), actionCollection(),
+										 this, TQ_SLOT(slotCascade()), actionCollection(),
 										 CResMgr::mainMenu::window::cascade::actionName
 										);
 	m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip );
@@ -295,7 +295,7 @@ void BibleTime::initActions() {
 	m_windowTileVertical_action = new TDEAction(i18n("Tile &vertically"),
 								  CResMgr::mainMenu::window::tileVertical::icon,
 								  CResMgr::mainMenu::window::tileVertical::accel,
-								  this, TQT_SLOT(slotTileVertical()), actionCollection(),
+								  this, TQ_SLOT(slotTileVertical()), actionCollection(),
 								  CResMgr::mainMenu::window::tileVertical::actionName
 											 );
 	m_windowTileVertical_action->setToolTip( CResMgr::mainMenu::window::tileVertical::tooltip );
@@ -307,7 +307,7 @@ void BibleTime::initActions() {
 	m_windowTileHorizontal_action = new TDEAction(i18n("Tile &horizontally"),
 									CResMgr::mainMenu::window::tileHorizontal::icon,
 									CResMgr::mainMenu::window::tileHorizontal::accel,
-									this, TQT_SLOT(slotTileHorizontal()), actionCollection(),
+									this, TQ_SLOT(slotTileHorizontal()), actionCollection(),
 									CResMgr::mainMenu::window::tileHorizontal::actionName
 											   );
 	m_windowTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::tileHorizontal::tooltip );
@@ -321,7 +321,7 @@ void BibleTime::initActions() {
 	m_windowCloseAll_action = new TDEAction(i18n("Cl&ose all"),
 										  CResMgr::mainMenu::window::closeAll::icon,
 										  CResMgr::mainMenu::window::closeAll::accel,
-										  m_mdi, TQT_SLOT(deleteAll()), actionCollection(),
+										  m_mdi, TQ_SLOT(deleteAll()), actionCollection(),
 										  CResMgr::mainMenu::window::closeAll::actionName
 										 );
 	m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip );
@@ -347,7 +347,7 @@ void BibleTime::initActions() {
 	m_windowSaveToNewProfile_action = new TDEAction(i18n("Save as &new session"),
 									  CResMgr::mainMenu::window::saveToNewProfile::icon,
 									  CResMgr::mainMenu::window::saveToNewProfile::accel,
-									  this, TQT_SLOT(saveToNewProfile()), actionCollection(),
+									  this, TQ_SLOT(saveToNewProfile()), actionCollection(),
 									  CResMgr::mainMenu::window::saveToNewProfile::actionName
 												 );
 	m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip );
@@ -384,7 +384,7 @@ void BibleTime::initActions() {
 	m_windowFullscreen_action = new TDEToggleAction(i18n("&Fullscreen mode"),
 								CResMgr::mainMenu::window::showFullscreen::icon,
 								CResMgr::mainMenu::window::showFullscreen::accel,
-								this, TQT_SLOT(toggleFullscreen()), actionCollection(),
+								this, TQ_SLOT(toggleFullscreen()), actionCollection(),
 								CResMgr::mainMenu::window::showFullscreen::actionName
 												 );
 	m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip );
@@ -399,9 +399,9 @@ void BibleTime::initActions() {
 	TDEPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
 	TDEPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
 
-	connect(loadPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(loadProfile(int)));
-	connect(savePopup, TQT_SIGNAL(activated(int)), TQT_SLOT(saveProfile(int)));
-	connect(deletePopup, TQT_SIGNAL(activated(int)), TQT_SLOT(deleteProfile(int)));
+	connect(loadPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(loadProfile(int)));
+	connect(savePopup, TQ_SIGNAL(activated(int)), TQ_SLOT(saveProfile(int)));
+	connect(deletePopup, TQ_SIGNAL(activated(int)), TQ_SLOT(deleteProfile(int)));
 
 	refreshProfileMenus();
 
@@ -413,7 +413,7 @@ void BibleTime::initActions() {
 	action = new TDEAction(i18n("&Handbook"),
 						 CResMgr::mainMenu::help::handbook::icon,
 						 CResMgr::mainMenu::help::handbook::accel,
-						 this, TQT_SLOT(openOnlineHelp_Handbook()), actionCollection(),
+						 this, TQ_SLOT(openOnlineHelp_Handbook()), actionCollection(),
 						 CResMgr::mainMenu::help::handbook::actionName
 						);
 	action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip );
@@ -426,7 +426,7 @@ void BibleTime::initActions() {
 	action = new TDEAction(i18n("&Bible Study Howto"),
 						 CResMgr::mainMenu::help::bibleStudyHowTo::icon,
 						 CResMgr::mainMenu::help::bibleStudyHowTo::accel,
-						 this, TQT_SLOT(openOnlineHelp_Howto()), actionCollection(),
+						 this, TQ_SLOT(openOnlineHelp_Howto()), actionCollection(),
 						 CResMgr::mainMenu::help::bibleStudyHowTo::actionName
 						);
 	action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip );
@@ -447,7 +447,7 @@ void BibleTime::initActions() {
 		actionCollection()->remove
 		(actionCollection()->action(KStdAction::stdName( KStdAction::ReportBug )));
 	}
-	action = KStdAction::reportBug(m_helpMenu, TQT_SLOT(reportBug()), actionCollection());
+	action = KStdAction::reportBug(m_helpMenu, TQ_SLOT(reportBug()), actionCollection());
 	action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip);
 	#if TDE_VERSION_MINOR < 1
 
@@ -457,7 +457,7 @@ void BibleTime::initActions() {
 	action = new TDEAction(i18n("&Daily tip"),
 						 CResMgr::mainMenu::help::dailyTip::icon,
 						 CResMgr::mainMenu::help::dailyTip::accel,
-						 this, TQT_SLOT(slotHelpTipOfDay()), actionCollection(),
+						 this, TQ_SLOT(slotHelpTipOfDay()), actionCollection(),
 						 CResMgr::mainMenu::help::dailyTip::actionName
 						);
 	action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip);
@@ -470,7 +470,7 @@ void BibleTime::initActions() {
 		actionCollection()->remove
 		(actionCollection()->action(KStdAction::stdName( KStdAction::AboutApp )));
 	}
-	action = KStdAction::aboutApp(m_helpMenu, TQT_SLOT(aboutApplication()), actionCollection());
+	action = KStdAction::aboutApp(m_helpMenu, TQ_SLOT(aboutApplication()), actionCollection());
 	action->setToolTip(CResMgr::mainMenu::help::aboutBibleTime::tooltip);
 
 	//delete About KDE action if KDE created it already
@@ -478,7 +478,7 @@ void BibleTime::initActions() {
 		actionCollection()->remove
 		(actionCollection()->action(KStdAction::stdName( KStdAction::AboutKDE )));
 	}
-	action = KStdAction::aboutKDE(m_helpMenu, TQT_SLOT(aboutKDE()), actionCollection());
+	action = KStdAction::aboutKDE(m_helpMenu, TQ_SLOT(aboutKDE()), actionCollection());
 	action->setToolTip(CResMgr::mainMenu::help::aboutKDE::tooltip);
 }
 
@@ -488,17 +488,17 @@ void BibleTime::initMenubar() {
 	m_windowMenu = dynamic_cast<TQPopupMenu*>(m_windowCloseAll_action->container(0));
 }
 
-/** Initializes the TQT_SIGNAL / TQT_SLOT connections */
+/** Initializes the signal / slot connections */
 void BibleTime::initConnections() {
-	connect(m_mdi, TQT_SIGNAL(sigSetToplevelCaption(const TQString&)),
-			this, TQT_SLOT(setPlainCaption(const TQString&)));
-	connect(m_mdi, TQT_SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)),
-			this, TQT_SLOT(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)));
+	connect(m_mdi, TQ_SIGNAL(sigSetToplevelCaption(const TQString&)),
+			this, TQ_SLOT(setPlainCaption(const TQString&)));
+	connect(m_mdi, TQ_SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)),
+			this, TQ_SLOT(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)));
 
 	Q_ASSERT(m_windowMenu);
 	if (m_windowMenu) {
-		connect(m_windowMenu, TQT_SIGNAL(aboutToShow()),
-				this, TQT_SLOT(slotWindowMenuAboutToShow()));
+		connect(m_windowMenu, TQ_SIGNAL(aboutToShow()),
+				this, TQ_SLOT(slotWindowMenuAboutToShow()));
 	}
 	else {
 		tqWarning("Main window: can't find window menu");
@@ -506,14 +506,14 @@ void BibleTime::initConnections() {
 
 
 	connect(
-		m_mainIndex, TQT_SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)),
-		this, TQT_SLOT(createReadDisplayWindow(ListCSwordModuleInfo,const TQString&))
+		m_mainIndex, TQ_SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)),
+		this, TQ_SLOT(createReadDisplayWindow(ListCSwordModuleInfo,const TQString&))
 	);
 	connect(
-		m_mainIndex, TQT_SIGNAL(createWriteDisplayWindow(CSwordModuleInfo*, const TQString&, const CDisplayWindow::WriteWindowType&)),
-		this, TQT_SLOT(createWriteDisplayWindow(CSwordModuleInfo*,const TQString&, const CDisplayWindow::WriteWindowType&))
+		m_mainIndex, TQ_SIGNAL(createWriteDisplayWindow(CSwordModuleInfo*, const TQString&, const CDisplayWindow::WriteWindowType&)),
+		this, TQ_SLOT(createWriteDisplayWindow(CSwordModuleInfo*,const TQString&, const CDisplayWindow::WriteWindowType&))
 	);
-	connect(m_mainIndex, TQT_SIGNAL(signalSwordSetupChanged()), this, TQT_SLOT(slotSwordSetupChanged()));
+	connect(m_mainIndex, TQ_SIGNAL(signalSwordSetupChanged()), this, TQ_SLOT(slotSwordSetupChanged()));
 }
 
 /** Initializes the backend */
diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp
index 094110d..b902a02 100644
--- a/bibletime/bibletime_slots.cpp
+++ b/bibletime/bibletime_slots.cpp
@@ -86,7 +86,7 @@ private:
 /** Opens the optionsdialog of BibleTime. */
 void BibleTime::slotSettingsOptions() {
 	COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", actionCollection());
-	connect(dlg, TQT_SIGNAL(signalSettingsChanged()), TQT_SLOT(slotSettingsChanged()) );
+	connect(dlg, TQ_SIGNAL(signalSettingsChanged()), TQ_SLOT(slotSettingsChanged()) );
 
 	dlg->exec();
 	dlg->delayedDestruct();
@@ -113,7 +113,7 @@ void BibleTime::slotSettingsChanged() {
 /** Opens the sword setup dialog of BibleTime. */
 void BibleTime::slotSwordSetupDialog() {
 	BookshelfManager::CSwordSetupDialog *dlg = new BookshelfManager::CSwordSetupDialog(this, "CSwordSetupDialog");
-	connect(dlg, TQT_SIGNAL(signalSwordSetupChanged()), TQT_SLOT(slotSwordSetupChanged()) );
+	connect(dlg, TQ_SIGNAL(signalSwordSetupChanged()), TQ_SLOT(slotSwordSetupChanged()) );
 
 	dlg->exec();
 	dlg->delayedDestruct();
@@ -188,7 +188,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
 		TQWidget* w = windows.at(i);
 		Q_ASSERT(w);
 
-		KUserDataAction* action = new KUserDataAction(w->caption(), TDEShortcut(), this, TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
+		KUserDataAction* action = new KUserDataAction(w->caption(), TDEShortcut(), this, TQ_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
 		Q_ASSERT(action);
 		action->setUserData(w);
 
diff --git a/bibletime/frontend/cinfodisplay.cpp b/bibletime/frontend/cinfodisplay.cpp
index 0f8cf40..9431be9 100644
--- a/bibletime/frontend/cinfodisplay.cpp
+++ b/bibletime/frontend/cinfodisplay.cpp
@@ -55,12 +55,12 @@ namespace InfoDisplay {
 
 		m_htmlPart = CDisplay::createReadInstance(0, this);
 		m_htmlPart->setMouseTracking(false); //we don't want strong/lemma/note mouse infos
-		KStdAction::copy(m_htmlPart->connectionsProxy(), TQT_SLOT(copySelection()), 0, "copyMagSelection");
+		KStdAction::copy(m_htmlPart->connectionsProxy(), TQ_SLOT(copySelection()), 0, "copyMagSelection");
 
 		connect(
 			m_htmlPart->connectionsProxy(),
-			TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)),
-			TQT_SLOT(lookup(const TQString&, const TQString&))
+			TQ_SIGNAL(referenceClicked(const TQString&, const TQString&)),
+			TQ_SLOT(lookup(const TQString&, const TQString&))
 		);
 
 		layout->addWidget(headingLabel);
diff --git a/bibletime/frontend/cinputdialog.cpp b/bibletime/frontend/cinputdialog.cpp
index 9274acf..048c88a 100644
--- a/bibletime/frontend/cinputdialog.cpp
+++ b/bibletime/frontend/cinputdialog.cpp
@@ -50,21 +50,21 @@ CInputDialog::CInputDialog(const TQString& caption, const TQString& description,
 
 	TQPushButton* cancel = new TQPushButton(this);
 	cancel->setText(i18n("&Cancel"));
-	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+	connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 	buttonLayout->addWidget(cancel,1);
 
 	buttonLayout->addSpacing(15);
 
 	TQPushButton* clear = new TQPushButton(this);
 	clear->setText(i18n("C&lear"));
-	connect(clear, TQT_SIGNAL(clicked()),m_editWidget, TQT_SLOT(clear()));
+	connect(clear, TQ_SIGNAL(clicked()),m_editWidget, TQ_SLOT(clear()));
 	buttonLayout->addWidget(clear,1);
 
 	buttonLayout->addSpacing(15);
 
 	TQPushButton* ok = new TQPushButton(this);
 	ok->setText(i18n("&Ok"));
-	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
+	connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
 	buttonLayout->addWidget(ok,1);
 
 	m_editWidget->setFocus();
diff --git a/bibletime/frontend/cmanageindiceswidget.cpp b/bibletime/frontend/cmanageindiceswidget.cpp
index 9f7ecb7..f14f8c9 100644
--- a/bibletime/frontend/cmanageindiceswidget.cpp
+++ b/bibletime/frontend/cmanageindiceswidget.cpp
@@ -78,8 +78,8 @@ void CManageIndicesWidget::initView()
 	m_deleteIndicesButton->setIconSet(SmallIcon("remove", 16));
 
 	// connect our signals/slots
-	connect(m_createIndicesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(createIndices()));
-	connect(m_deleteIndicesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteIndices()));
+	connect(m_createIndicesButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(createIndices()));
+	connect(m_deleteIndicesButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteIndices()));
 }
 
 /** Populates the module list with installed modules and orphaned indices */
diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp
index c57f4bd..0fc191d 100644
--- a/bibletime/frontend/cmdiarea.cpp
+++ b/bibletime/frontend/cmdiarea.cpp
@@ -48,8 +48,8 @@ void CMDIArea::initView() {
 
 /** Initilizes the connectiosn to SIGNALS */
 void CMDIArea::initConnections() {
-	connect(this, TQT_SIGNAL(windowActivated(TQWidget*)),
-			this, TQT_SLOT(slotClientActivated(TQWidget*)));
+	connect(this, TQ_SIGNAL(windowActivated(TQWidget*)),
+			this, TQ_SLOT(slotClientActivated(TQWidget*)));
 }
 
 /** Called whan a client window was activated */
@@ -315,13 +315,13 @@ void CMDIArea::triggerWindowUpdate() {
 	if (isUpdatesEnabled() && usableWindowList().count() ) {
 		switch (m_guiOption) {
 			case autoTileVertical:
-			TQTimer::singleShot(0, this, TQT_SLOT(myTileVertical()));
+			TQTimer::singleShot(0, this, TQ_SLOT(myTileVertical()));
 			break;
 			case autoTileHorizontal:
-			TQTimer::singleShot(0, this, TQT_SLOT(myTileHorizontal()));
+			TQTimer::singleShot(0, this, TQ_SLOT(myTileHorizontal()));
 			break;
 			case autoCascade:
-			TQTimer::singleShot(0, this, TQT_SLOT(myCascade()));
+			TQTimer::singleShot(0, this, TQ_SLOT(myCascade()));
 			break;
 			default:
 			tqDebug("CMDIArea::triggerWindowUpdate: no known m_guiType");
diff --git a/bibletime/frontend/cmoduleindexdialog.cpp b/bibletime/frontend/cmoduleindexdialog.cpp
index 09f4b43..9f22a24 100644
--- a/bibletime/frontend/cmoduleindexdialog.cpp
+++ b/bibletime/frontend/cmoduleindexdialog.cpp
@@ -47,8 +47,8 @@ void CModuleIndexDialog::indexAllModules( const ListCSwordModuleInfo& modules )
 
 	ListCSwordModuleInfo::const_iterator end_it = modules.end();
 	for( ListCSwordModuleInfo::const_iterator it = modules.begin(); it != end_it; ++it) {
-		(*it)->connectIndexingFinished(this, TQT_SLOT(slotFinished()));
-		(*it)->connectIndexingProgress(this, TQT_SLOT(slotModuleProgress(int)));
+		(*it)->connectIndexingFinished(this, TQ_SLOT(slotFinished()));
+		(*it)->connectIndexingProgress(this, TQ_SLOT(slotModuleProgress(int)));
 
 		progress->setLabel(i18n("Creating index for work %1").arg((*it)->name()));
 		tqDebug("Building index for work %s", (*it)->name().latin1());
diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp
index 0b1baad..6c0a210 100644
--- a/bibletime/frontend/coptionsdialog.cpp
+++ b/bibletime/frontend/coptionsdialog.cpp
@@ -176,8 +176,8 @@ void COptionsDialog::initDisplay() {
 	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() ) );
+	connect( m_settings.displayStyle.styleChooser, TQ_SIGNAL( activated( int ) ),
+			 this, TQ_SLOT( updateStylePreview() ) );
 
 	hboxlayout->addWidget(
 		new TQLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page)
@@ -335,7 +335,7 @@ void COptionsDialog::initLanguages() {
 		}
 
 		m_settings.fonts.useOwnFontBox = new TQCheckBox(i18n("Use custom font"), page, "font checkbox");
-		connect(m_settings.fonts.useOwnFontBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(useOwnFontClicked(bool)));
+		connect(m_settings.fonts.useOwnFontBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(useOwnFontClicked(bool)));
 		hLayout->addWidget(m_settings.fonts.useOwnFontBox);
 
 		layout->addLayout(hLayout);
@@ -345,8 +345,8 @@ void COptionsDialog::initLanguages() {
 		m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog."));
 		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&)));
+		connect(m_settings.fonts.fontChooser, TQ_SIGNAL(fontSelected(const TQFont&)), TQ_SLOT(newDisplayWindowFontSelected(const TQFont&)));
+		connect(m_settings.fonts.usage, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(newDisplayWindowFontAreaSelected(const TQString&)));
 
 		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 );
@@ -369,8 +369,8 @@ void COptionsDialog::initAccelerators() {
 	TQLabel* label = new TQLabel(i18n("Choose type:"), hbox);
 	m_settings.keys.typeChooser = new TQComboBox(hbox);
 	connect(
-		m_settings.keys.typeChooser, TQT_SIGNAL(activated(const TQString&)),
-		TQT_SLOT(slotKeyChooserTypeChanged(const TQString&))
+		m_settings.keys.typeChooser, TQ_SIGNAL(activated(const TQString&)),
+		TQ_SLOT(slotKeyChooserTypeChanged(const TQString&))
 	);
 	TQLabel* dummy = new TQLabel( hbox ); // empty label for stretch
 
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
index 1fe6d1c..06c65a7 100644
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ b/bibletime/frontend/cswordsetupdialog.cpp
@@ -96,22 +96,22 @@ namespace BookshelfManager {
 		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()));
+		connect(m_swordPathListBox, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slot_swordPathSelected()));
 		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()));
+		connect(m_swordEditPathButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_swordEditClicked()));
 		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()));
+		connect(m_swordAddPathButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_swordAddClicked()));
 		layout->addWidget(m_swordAddPathButton, 3,3);
 
 		m_swordRemovePathButton = new TQPushButton(i18n("Remove Entry"), page);
 		m_swordRemovePathButton->setIconSet(SmallIcon("edit-delete", 16));
-		connect(m_swordRemovePathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordRemoveClicked()));
+		connect(m_swordRemovePathButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_swordRemoveClicked()));
 		layout->addWidget(m_swordRemovePathButton, 4,3);
 
 		setupSwordPathListBox();
@@ -157,12 +157,12 @@ the module remote installation feature!</b>")
 
 		TQPushButton* deleteSourceButton = new TQPushButton(i18n("Delete library"), m_installSourcePage);
 		deleteSourceButton->setIconSet(SmallIcon("remove", 16));
-		connect(deleteSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installDeleteSource()));
+		connect(deleteSourceButton, TQ_SIGNAL(clicked()), TQ_SLOT(slot_installDeleteSource()));
 		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()));
+		connect(addSourceButton, TQ_SIGNAL(clicked()), TQ_SLOT(slot_installAddSource()));
 		layout->addWidget(addSourceButton, 2, 2, TQt::AlignLeft);
 
 		m_sourceLabel = new TQLabel(m_installSourcePage);
@@ -190,13 +190,13 @@ the module remote installation feature!</b>")
 
 		m_installContinueButton = new TQPushButton(i18n("Connect to library"), m_installPage);
 		m_installContinueButton->setIconSet(SmallIcon("forward",16));
-		connect(m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_connectToSource()));
+		connect(m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_connectToSource()));
 		myHBox->addWidget(m_installContinueButton);
 
 		m_installBackButton->setEnabled(false);
 
-		connect(m_sourceCombo, TQT_SIGNAL( highlighted(const TQString&) ), TQT_SLOT( slot_sourceSelected( const TQString&) ));
-		connect(m_targetCombo, TQT_SIGNAL( highlighted(const TQString&) ), TQT_SLOT( slot_targetSelected( const TQString&) ));
+		connect(m_sourceCombo, TQ_SIGNAL( highlighted(const TQString&) ), TQ_SLOT( slot_sourceSelected( const TQString&) ));
+		connect(m_targetCombo, TQ_SIGNAL( highlighted(const TQString&) ), TQ_SLOT( slot_targetSelected( const TQString&) ));
 		populateInstallCombos();
 
 		slot_sourceSelected( m_sourceCombo->currentText() );
@@ -230,8 +230,8 @@ the module remote installation feature!</b>")
 		m_removeRemoveButton->setIconSet( SmallIcon("edittrash", 16) );
 		layout->addWidget(m_removeRemoveButton, 3, 3, TQt::AlignRight);
 
-		connect(m_removeRemoveButton, TQT_SIGNAL(clicked()),
-				this, TQT_SLOT(slot_doRemoveModules()));
+		connect(m_removeRemoveButton, TQ_SIGNAL(clicked()),
+				this, TQ_SLOT(slot_doRemoveModules()));
 
 		populateRemoveModuleListView();
 	}
@@ -490,12 +490,12 @@ the module remote installation feature!</b>")
 		TDEApplication::kApplication()->processEvents();
 
 		connect(
-			m_progressDialog, TQT_SIGNAL(cancelClicked()),
-			TQT_SLOT(slot_moduleRefreshProgressCancelClicked())
+			m_progressDialog, TQ_SIGNAL(cancelClicked()),
+			TQ_SLOT(slot_moduleRefreshProgressCancelClicked())
 		);
 		connect(
-			&iMgr, TQT_SIGNAL(completed(const int, const int)),
-			TQT_SLOT(slot_moduleRefreshCompleted(const int, const int))
+			&iMgr, TQ_SIGNAL(completed(const int, const int)),
+			TQ_SLOT(slot_moduleRefreshCompleted(const int, const int))
 		);
 
 
@@ -635,21 +635,21 @@ the module remote installation feature!</b>")
 			layout->setColStretch(0,5);
 			layout->setRowStretch(1,5);
 
-			connect(m_installModuleListView, TQT_SIGNAL(selectedModulesChanged()), TQT_SLOT(slot_installModulesChanged()));
+			connect(m_installModuleListView, TQ_SIGNAL(selectedModulesChanged()), TQ_SLOT(slot_installModulesChanged()));
 		}
 
 		if (populateInstallModuleListView( currentInstallSource() ) ){
 
 			//code valid for already existing and newly created widgets
-			disconnect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_connectToSource()));
-			connect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_installModules()));
+			disconnect( m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_connectToSource()));
+			connect( m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_installModules()));
 	
 			m_installContinueButton->setText(i18n("Install works"));
 			m_installContinueButton->setEnabled(false);
 	
 			m_installWidgetStack->raiseWidget(m_installModuleListPage);
 	
-			connect( m_installBackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_showInstallSourcePage()));
+			connect( m_installBackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_showInstallSourcePage()));
 			m_installBackButton->setEnabled(true);
 		}
 	}
@@ -730,12 +730,12 @@ the module remote installation feature!</b>")
 			TDEApplication::kApplication()->processEvents();
 
 			connect(
-				m_progressDialog, TQT_SIGNAL(cancelClicked()),
-				TQT_SLOT(slot_installProgressCancelClicked())
+				m_progressDialog, TQ_SIGNAL(cancelClicked()),
+				TQ_SLOT(slot_installProgressCancelClicked())
 			);
 			connect(
-				&iMgr, TQT_SIGNAL(completed(const int, const int)),
-				TQT_SLOT(installCompleted(const int, const int))
+				&iMgr, TQ_SIGNAL(completed(const int, const int)),
+				TQ_SLOT(installCompleted(const int, const int))
 			);
 
 			for ( TQStringList::Iterator it = moduleList.begin(); (it != moduleList.end()) && !m_progressDialog->wasCancelled(); ++it, ++m_installedModuleCount ) {
@@ -801,8 +801,8 @@ the module remote installation feature!</b>")
 	}
 
 	void CSwordSetupDialog::slot_showInstallSourcePage() {
-		connect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_connectToSource()));
-		disconnect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_installModules()));
+		connect( m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_connectToSource()));
+		disconnect( m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_installModules()));
 		m_installBackButton->setEnabled(false);
 
 		m_installContinueButton->setText(i18n("Connect to library"));
diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
index 1b028ac..d023147 100644
--- a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
+++ b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
@@ -84,9 +84,9 @@ namespace BookshelfManager {
 		buttonLayout->addWidget( okButton);
 		buttonLayout->addStretch();
 
-		connect( okButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) );
-		connect( discardButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
-		connect( m_protocolCombo, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotProtocolChanged() ) );
+		connect( okButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOk() ) );
+		connect( discardButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
+		connect( m_protocolCombo, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotProtocolChanged() ) );
 
 	}
 	void CSwordSetupInstallSourcesDialog::slotOk() {
diff --git a/bibletime/frontend/cswordsetupmodulelistview.cpp b/bibletime/frontend/cswordsetupmodulelistview.cpp
index 7ecf68c..f80d516 100644
--- a/bibletime/frontend/cswordsetupmodulelistview.cpp
+++ b/bibletime/frontend/cswordsetupmodulelistview.cpp
@@ -124,9 +124,9 @@ namespace BookshelfManager {
         m_categoryDevotionals->setOpen(true);
         m_categoryGlossaries->setOpen(true);
 
-        //   connect(this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*)));
-        connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); //items have to be clicked only once in double click mode
-        connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*)));
+        //   connect(this, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*)));
+        connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); //items have to be clicked only once in double click mode
+        connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*)));
     }
 
     void CSwordSetupModuleListView::finish() {
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
index 84ee39f..7d0719d 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -205,7 +205,7 @@ void CHTMLReadDisplay::moveToAnchor( const TQString& anchor ) {
 	m_currentAnchorCache = anchor;
 
 	//This is an ugly hack to work around a KDE problem in KDE including 3.3.1 (no later versions tested so far)
-	TQTimer::singleShot(0, this, TQT_SLOT(slotGoToAnchor()));
+	TQTimer::singleShot(0, this, TQ_SLOT(slotGoToAnchor()));
 
 	// instead of:
 	//  slotGoToAnchor();
@@ -442,8 +442,8 @@ void CHTMLReadDisplayView::popupMenu( const TQString& url, const TQPoint& pos) {
 /** Reimplementation from TQScrollView. Sets the right slots */
 void CHTMLReadDisplayView::polish() {
 	TDEHTMLView::polish();
-	connect( part(), TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
-			this, TQT_SLOT(popupMenu(const TQString&, const TQPoint&)));
+	connect( part(), TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
+			this, TQ_SLOT(popupMenu(const TQString&, const TQPoint&)));
 }
 
 /** Reimplementatiob from TQScrollView. */
diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
index 18ed276..18e23f5 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.cpp
+++ b/bibletime/frontend/display/chtmlwritedisplay.cpp
@@ -138,7 +138,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	m_actions.fontChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontFamily::tooltip );
 
 	m_actions.fontChooser->plug(bar);
-	connect(m_actions.fontChooser, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setFamily(const TQString&)));
+	connect(m_actions.fontChooser, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setFamily(const TQString&)));
 
 
 	m_actions.fontSizeChooser = new TDEFontSizeAction( i18n("Choose a font size"),
@@ -149,10 +149,10 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	m_actions.fontSizeChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontSize::tooltip );
 
 	m_actions.fontSizeChooser->plug(bar);
-	connect(m_actions.fontSizeChooser, TQT_SIGNAL(fontSizeChanged(int)), this, TQT_SLOT(setPointSize(int)));
+	connect(m_actions.fontSizeChooser, TQ_SIGNAL(fontSizeChanged(int)), this, TQ_SLOT(setPointSize(int)));
 
 	m_colorButton = new KColorButton(bar);
-	connect(m_colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotColorSelected(const TQColor&)));
+	connect(m_colorButton, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotColorSelected(const TQColor&)));
 	bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton);
 	TQToolTip::add
 		(m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::tooltip );
@@ -164,7 +164,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	m_actions.bold = new TDEToggleAction( i18n("Bold"),
 										CResMgr::displaywindows::writeWindow::boldText::icon,
 										CResMgr::displaywindows::writeWindow::boldText::accel,
-										this, TQT_SLOT(toggleBold()),
+										this, TQ_SLOT(toggleBold()),
 										actions,
 										CResMgr::displaywindows::writeWindow::boldText::actionName
 									  );
@@ -175,7 +175,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	m_actions.italic = new TDEToggleAction( i18n("Italic"),
 										  CResMgr::displaywindows::writeWindow::italicText::icon,
 										  CResMgr::displaywindows::writeWindow::italicText::accel,
-										  this, TQT_SLOT(toggleItalic()),
+										  this, TQ_SLOT(toggleItalic()),
 										  actions,
 										  CResMgr::displaywindows::writeWindow::italicText::actionName
 										);
@@ -186,7 +186,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	m_actions.underline = new TDEToggleAction( i18n("Underline"),
 						  CResMgr::displaywindows::writeWindow::underlinedText::icon,
 						  CResMgr::displaywindows::writeWindow::underlinedText::accel,
-						  this, TQT_SLOT(toggleUnderline()),
+						  this, TQ_SLOT(toggleUnderline()),
 						  actions,
 						  CResMgr::displaywindows::writeWindow::underlinedText::actionName
 										   );
@@ -200,7 +200,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	m_actions.alignLeft = new TDEToggleAction( i18n("Left"),
 						  CResMgr::displaywindows::writeWindow::alignLeft::icon,
 						  CResMgr::displaywindows::writeWindow::alignLeft::accel,
-						  this, TQT_SLOT( alignLeft()  ),
+						  this, TQ_SLOT( alignLeft()  ),
 						  actions,
 						  CResMgr::displaywindows::writeWindow::alignLeft::actionName
 										   );
@@ -211,7 +211,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	m_actions.alignCenter = new TDEToggleAction( i18n("Center"),
 							CResMgr::displaywindows::writeWindow::alignCenter::icon,
 							CResMgr::displaywindows::writeWindow::alignCenter::accel,
-							this, TQT_SLOT(alignCenter()),
+							this, TQ_SLOT(alignCenter()),
 							actions,
 							CResMgr::displaywindows::writeWindow::alignCenter::actionName
 											 );
@@ -222,7 +222,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	m_actions.alignRight = new TDEToggleAction( i18n("Right"),
 						   CResMgr::displaywindows::writeWindow::alignRight::icon,
 						   CResMgr::displaywindows::writeWindow::alignRight::accel,
-						   this, TQT_SLOT(alignRight()),
+						   this, TQ_SLOT(alignRight()),
 						   actions,
 						   CResMgr::displaywindows::writeWindow::alignRight::actionName
 											);
@@ -233,7 +233,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	//  m_actions.alignJustify = new TDEToggleAction( i18n("Justify"),
 	//    CResMgr::displaywindows::writeWindow::alignJustify::icon,
 	//    CResMgr::displaywindows::writeWindow::alignJustify::accel,
-	//    this, TQT_SLOT( alignJustify()  ),
+	//    this, TQ_SLOT( alignJustify()  ),
 	//    actions
 	//  );
 	//  m_actions.alignJustify->setToolTip( CResMgr::displaywindows::writeWindow::alignJustify::tooltip );
@@ -241,9 +241,9 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 	//  m_actions.alignJustify->plug(bar);
 
 
-	connect(this, TQT_SIGNAL(currentFontChanged(const TQFont&)), TQT_SLOT(slotFontChanged(const TQFont&)));
-	connect(this, TQT_SIGNAL(currentAlignmentChanged(int)), TQT_SLOT(slotAlignmentChanged(int)));
-	connect(this, TQT_SIGNAL(currentColorChanged(const TQColor&)), TQT_SLOT(slotColorChanged(const TQColor&)));
+	connect(this, TQ_SIGNAL(currentFontChanged(const TQFont&)), TQ_SLOT(slotFontChanged(const TQFont&)));
+	connect(this, TQ_SIGNAL(currentAlignmentChanged(int)), TQ_SLOT(slotAlignmentChanged(int)));
+	connect(this, TQ_SIGNAL(currentColorChanged(const TQColor&)), TQ_SLOT(slotColorChanged(const TQColor&)));
 
 
 	//set initial values for toolbar items
@@ -255,7 +255,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
 /** Reimplementation to show a popup menu if the right mouse butoon was clicked. */
 TQPopupMenu* CHTMLWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) {
 	if (!m_actions.selectAll) {
-		m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), this, TQT_SLOT(selectAll()), this);
+		m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), this, TQ_SLOT(selectAll()), this);
 	}
 
 	TDEPopupMenu* popup = new TDEPopupMenu(this);
diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp
index 950f724..08286b6 100644
--- a/bibletime/frontend/display/cplainwritedisplay.cpp
+++ b/bibletime/frontend/display/cplainwritedisplay.cpp
@@ -28,8 +28,8 @@ CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* par
 	setAcceptDrops(true);
 	viewport()->setAcceptDrops(true);
 
-	connect(this, TQT_SIGNAL(textChanged()),
-			connectionsProxy(), TQT_SLOT(emitTextChanged()));
+	connect(this, TQ_SIGNAL(textChanged()),
+			connectionsProxy(), TQ_SLOT(emitTextChanged()));
 }
 
 CPlainWriteDisplay::~CPlainWriteDisplay() {}
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
index 8df3a6e..c49e50f 100644
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
@@ -133,37 +133,37 @@ void CBibleReadWindow::initActions() {
 	new TDEAction(
 		i18n("Next book"),
 		CResMgr::displaywindows::bibleWindow::nextBook::accel,
-		this, TQT_SLOT(nextBook()),
+		this, TQ_SLOT(nextBook()),
 		actionCollection(), "nextBook"
 	);
 	new TDEAction(
 		i18n("Previous book"),
 		CResMgr::displaywindows::bibleWindow::previousBook::accel,
-		this, TQT_SLOT(previousBook()),
+		this, TQ_SLOT(previousBook()),
 		actionCollection(), "previousBook"
 	);
 	new TDEAction(
 		i18n("Next chapter"),
 		CResMgr::displaywindows::bibleWindow::nextChapter::accel,
-		this, TQT_SLOT(nextChapter()),
+		this, TQ_SLOT(nextChapter()),
 		actionCollection(), "nextChapter"
 	);
 	new TDEAction(
 		i18n("Previous chapter"),
 		CResMgr::displaywindows::bibleWindow::previousChapter::accel,
-		this, TQT_SLOT(previousChapter()),
+		this, TQ_SLOT(previousChapter()),
 		actionCollection(), "previousChapter"
 	);
 	new TDEAction(
 		i18n("Next verse"),
 		CResMgr::displaywindows::bibleWindow::nextVerse::accel,
-		this, TQT_SLOT(nextVerse()),
+		this, TQ_SLOT(nextVerse()),
 		actionCollection(), "nextVerse"
 	);
 	new TDEAction(
 		i18n("Previous verse"),
 		CResMgr::displaywindows::bibleWindow::previousVerse::accel,
-		this, TQT_SLOT(previousVerse()),
+		this, TQ_SLOT(previousVerse()),
 		actionCollection(), "previousVerse"
 	);
 
@@ -177,31 +177,31 @@ void CBibleReadWindow::initActions() {
 		i18n("Strong's Search"),
 		CResMgr::displaywindows::general::findStrongs::icon,
 		CResMgr::displaywindows::general::findStrongs::accel,
-		this, TQT_SLOT(openSearchStrongsDialog()),
+		this, TQ_SLOT(openSearchStrongsDialog()),
 		actionCollection(),
 		CResMgr::displaywindows::general::findStrongs::actionName);
 
 
-	m_actions.copy.referenceOnly = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
+	m_actions.copy.referenceOnly = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
 
-	m_actions.copy.referenceTextOnly = new TDEAction(i18n("Text of reference"), TDEShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference");
+	m_actions.copy.referenceTextOnly = new TDEAction(i18n("Text of reference"), TDEShortcut(0),displayWidget()->connectionsProxy(), TQ_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference");
 
-	m_actions.copy.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
+	m_actions.copy.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
 
-	m_actions.copy.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
+	m_actions.copy.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQ_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
 
 	m_actions.copy.selectedText = actionCollection()->action("copySelectedText");
 	Q_ASSERT(m_actions.copy.selectedText);
 
-	m_actions.save.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
+	m_actions.save.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
 
-	m_actions.save.chapterAsPlain = new TDEAction(i18n("Chapter as plain text"), TDEShortcut(0), this, TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
+	m_actions.save.chapterAsPlain = new TDEAction(i18n("Chapter as plain text"), TDEShortcut(0), this, TQ_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
 
-	m_actions.save.chapterAsHTML = new TDEAction(i18n("Chapter as HTML"), TDEShortcut(0), this, TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
+	m_actions.save.chapterAsHTML = new TDEAction(i18n("Chapter as HTML"), TDEShortcut(0), this, TQ_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
 
-	m_actions.print.reference = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
+	m_actions.print.reference = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
 
-	m_actions.print.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printChapter");
+	m_actions.print.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQ_SLOT(printAll()), actionCollection(), "printChapter");
 
 	CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection());
 }
@@ -210,7 +210,7 @@ void CBibleReadWindow::initConnections() {
 	CLexiconReadWindow::initConnections();
 
 	/*  if (m_transliterationButton) { // Transliteration is not always available
-	    connect(m_transliterationButton, TQT_SIGNAL(sigChanged()), TQT_SLOT(lookup()));
+	    connect(m_transliterationButton, TQ_SIGNAL(sigChanged()), TQ_SLOT(lookup()));
 	  }*/
 }
 
@@ -424,7 +424,7 @@ bool CBibleReadWindow::eventFilter( TQObject* o, TQEvent* e) {
 		* This is not really in a TDEHTML event handler but works anyway.
 		* Sometime KDE/TQt is hard to use ...
 		*/
-		TQTimer::singleShot(0, this, TQT_SLOT(syncWindows()));
+		TQTimer::singleShot(0, this, TQ_SLOT(syncWindows()));
 	}
 
 	return ret;
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
index 4da7e0d..c9bfb0c 100644
--- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
@@ -65,7 +65,7 @@ void CBookReadWindow::initActions() {
 					   i18n("Toggle tree view"),
 					   CResMgr::displaywindows::bookWindow::toggleTree::icon,
 					   CResMgr::displaywindows::bookWindow::toggleTree::accel,
-					   this, TQT_SLOT(treeToggled()),
+					   this, TQ_SLOT(treeToggled()),
 					   actionCollection(), "toggleTree");
 
 	CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection());
@@ -92,12 +92,12 @@ void CBookReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
 void CBookReadWindow::initConnections() {
 	CLexiconReadWindow::initConnections();
 
-	connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)),
-			this, TQT_SLOT(lookup(CSwordKey*)));
-	connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)),
-			keyChooser(), TQT_SLOT(updateKey(CSwordKey*)));
-	connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
-			m_treeChooser, TQT_SLOT(updateKey(CSwordKey*)));
+	connect(m_treeChooser, TQ_SIGNAL(keyChanged(CSwordKey*)),
+			this, TQ_SLOT(lookup(CSwordKey*)));
+	connect(m_treeChooser, TQ_SIGNAL(keyChanged(CSwordKey*)),
+			keyChooser(), TQ_SLOT(updateKey(CSwordKey*)));
+	connect(keyChooser(), TQ_SIGNAL(keyChanged(CSwordKey*)),
+			m_treeChooser, TQ_SLOT(updateKey(CSwordKey*)));
 }
 
 /** Init the view */
diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp
index 50965c3..86ee6b7 100644
--- a/bibletime/frontend/displaywindow/cbuttons.cpp
+++ b/bibletime/frontend/displaywindow/cbuttons.cpp
@@ -34,7 +34,7 @@
 //  setPopup(m_popup);
 //  setPopupDelay(0001);
 //
-//  connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(optionSelected(int)));
+//  connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(optionSelected(int)));
 //  populateMenu();
 // }
 //
@@ -97,7 +97,7 @@ CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *di
 	setPopup(m_popup);
 	setPopupDelay(0001); //Fix, O only opens menu on mouse release or move
 
-	connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(optionToggled(int)));
+	connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(optionToggled(int)));
 	populateMenu();
 }
 
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
index 3ad9ad2..086b00b 100644
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
@@ -110,37 +110,37 @@ void CCommentaryReadWindow::initActions() {
 	new TDEAction(
 		i18n("Next book"),
 		CResMgr::displaywindows::bibleWindow::nextBook::accel,
-		this, TQT_SLOT(nextBook()),
+		this, TQ_SLOT(nextBook()),
 		actionCollection(), "nextBook"
 	);
 	new TDEAction(
 		i18n("Previous book"),
 		CResMgr::displaywindows::bibleWindow::previousBook::accel,
-		this, TQT_SLOT(previousBook()),
+		this, TQ_SLOT(previousBook()),
 		actionCollection(), "previousBook"
 	);
 	new TDEAction(
 		i18n("Next chapter"),
 		CResMgr::displaywindows::bibleWindow::nextChapter::accel,
-		this, TQT_SLOT(nextChapter()),
+		this, TQ_SLOT(nextChapter()),
 		actionCollection(), "nextChapter"
 	);
 	new TDEAction(
 		i18n("Previous chapter"),
 		CResMgr::displaywindows::bibleWindow::previousChapter::accel,
-		this, TQT_SLOT(previousChapter()),
+		this, TQ_SLOT(previousChapter()),
 		actionCollection(), "previousChapter"
 	);
 	new TDEAction(
 		i18n("Next verse"),
 		CResMgr::displaywindows::bibleWindow::nextVerse::accel,
-		this, TQT_SLOT(nextVerse()),
+		this, TQ_SLOT(nextVerse()),
 		actionCollection(), "nextVerse"
 	);
 	new TDEAction(
 		i18n("Previous verse"),
 		CResMgr::displaywindows::bibleWindow::previousVerse::accel,
-		this, TQT_SLOT(previousVerse()),
+		this, TQ_SLOT(previousVerse()),
 		actionCollection(), "previousVerse"
 	);
 
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
index 4635899..a93f6e8 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -161,47 +161,47 @@ void CDisplayWindow::initActions() {
 	new TDEAction(i18n("Search"),
 				CResMgr::displaywindows::general::search::icon,
 				CResMgr::displaywindows::general::search::accel,
-				this, TQT_SLOT(slotSearchInModules()),
+				this, TQ_SLOT(slotSearchInModules()),
 				actionCollection(), CResMgr::displaywindows::general::search::actionName
 			   );
 
 	KStdAction::zoomIn(
-		displayWidget()->connectionsProxy(), TQT_SLOT(zoomIn()),
+		displayWidget()->connectionsProxy(), TQ_SLOT(zoomIn()),
 		actionCollection(), "zoomIn"
 	);
 	KStdAction::zoomOut(
-		displayWidget()->connectionsProxy(), TQT_SLOT(zoomOut()),
+		displayWidget()->connectionsProxy(), TQ_SLOT(zoomOut()),
 		actionCollection(), "zoomOut"
 	);
 	KStdAction::close(
-		this, TQT_SLOT(close()),
+		this, TQ_SLOT(close()),
 		actionCollection(), "closeWindow"
 	);
 
 	KStdAction::selectAll(
-		displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()),
+		displayWidget()->connectionsProxy(), TQ_SLOT(selectAll()),
 		actionCollection(), "selectAll"
 	);
 
 	KStdAction::copy(
-		displayWidget()->connectionsProxy(), TQT_SLOT(copySelection()),
+		displayWidget()->connectionsProxy(), TQ_SLOT(copySelection()),
 		actionCollection(), "copySelectedText"
 	);
 
 	KStdAction::find(
-		displayWidget()->connectionsProxy(), TQT_SLOT(openFindTextDialog()),
+		displayWidget()->connectionsProxy(), TQ_SLOT(openFindTextDialog()),
 		actionCollection(), "findText"
 	);
 
 	new TDEToolBarPopupAction(
 		i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel,
-		keyChooser(), TQT_SLOT( backInHistory() ),
+		keyChooser(), TQ_SLOT( backInHistory() ),
 		actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName
 	);
 
 	new TDEToolBarPopupAction(
 		i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel,
-		keyChooser(), TQT_SLOT( forwardInHistory() ),
+		keyChooser(), TQ_SLOT( forwardInHistory() ),
 		actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName
 	);
 
@@ -323,13 +323,13 @@ CModuleChooserBar* const CDisplayWindow::moduleChooserBar() const {
 /** Sets the module chooser bar. */
 void CDisplayWindow::setModuleChooserBar( CModuleChooserBar* bar ) {
 	if (m_moduleChooserBar) {
-		disconnect(m_moduleChooserBar, TQT_SIGNAL(sigChanged()), this, TQT_SLOT(modulesChanged()));
+		disconnect(m_moduleChooserBar, TQ_SIGNAL(sigChanged()), this, TQ_SLOT(modulesChanged()));
 	}
  	
 	//if a new bar should be set!
 	if (bar) {
 		m_moduleChooserBar = bar;
-		connect(bar, TQT_SIGNAL(sigChanged()), TQT_SLOT(modulesChanged()));
+		connect(bar, TQ_SIGNAL(sigChanged()), TQ_SLOT(modulesChanged()));
 	}
 }
 
@@ -397,10 +397,10 @@ CDisplaySettingsButton* const CDisplayWindow::displaySettingsButton() const {
 /** Sets the display settings button. */
 void CDisplayWindow::setDisplaySettingsButton( CDisplaySettingsButton* button ) {
 	if (m_displaySettingsButton)
-		disconnect(m_displaySettingsButton, TQT_SIGNAL( sigChanged() ),this, TQT_SLOT(lookup() ));
+		disconnect(m_displaySettingsButton, TQ_SIGNAL( sigChanged() ),this, TQ_SLOT(lookup() ));
 
 	m_displaySettingsButton = button;
-	connect(m_displaySettingsButton, TQT_SIGNAL(sigChanged()),this, TQT_SLOT(lookup()));
+	connect(m_displaySettingsButton, TQ_SIGNAL(sigChanged()),this, TQ_SLOT(lookup()));
 }
 
 /** Lookup the current key. Used to refresh the display. */
@@ -453,7 +453,7 @@ TDEPopupMenu* const CDisplayWindow::popup() {
 	// tqWarning("CReadWindow::popup()");
 	if (!m_popupMenu) {
 		m_popupMenu = new TDEPopupMenu(this);
-		connect(m_popupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updatePopupMenu()));
+		connect(m_popupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(updatePopupMenu()));
 		if (displayWidget()) {
 			displayWidget()->installPopup(m_popupMenu);
 		}
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
index 569963c..c5c1029 100644
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
@@ -48,10 +48,10 @@ void CHTMLWriteWindow::initView() {
 void CHTMLWriteWindow::initConnections() {
 	CWriteWindow::initConnections();
 
-	connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
-			this, TQT_SLOT(lookup(CSwordKey*)));
-	connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()),
-			this, TQT_SLOT(textChanged()) );
+	connect(keyChooser(), TQ_SIGNAL(keyChanged(CSwordKey*)),
+			this, TQ_SLOT(lookup(CSwordKey*)));
+	connect(displayWidget()->connectionsProxy(), TQ_SIGNAL(textChanged()),
+			this, TQ_SLOT(textChanged()) );
 };
 
 void CHTMLWriteWindow::initToolbars() {
@@ -68,7 +68,7 @@ void CHTMLWriteWindow::initToolbars() {
 	m_actions.saveText = new TDEAction( i18n("Save text"),
 									  CResMgr::displaywindows::writeWindow::saveText::icon,
 									  CResMgr::displaywindows::writeWindow::saveText::accel,
-									  this, TQT_SLOT( saveCurrentText()  ),
+									  this, TQ_SLOT( saveCurrentText()  ),
 									  actionCollection(),
 									  CResMgr::displaywindows::writeWindow::saveText::actionName
 									);
@@ -78,7 +78,7 @@ void CHTMLWriteWindow::initToolbars() {
 	m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"),
 										CResMgr::displaywindows::writeWindow::deleteEntry::icon,
 										CResMgr::displaywindows::writeWindow::deleteEntry::accel,
-										this, TQT_SLOT(deleteEntry()),
+										this, TQ_SLOT(deleteEntry()),
 										actionCollection(),
 										CResMgr::displaywindows::writeWindow::deleteEntry::actionName
 									   );
@@ -88,7 +88,7 @@ void CHTMLWriteWindow::initToolbars() {
 	m_actions.restoreText = new TDEAction(i18n("Restore original text"),
 										CResMgr::displaywindows::writeWindow::restoreText::icon,
 										CResMgr::displaywindows::writeWindow::restoreText::accel,
-										this, TQT_SLOT(restoreText()), actionCollection(),
+										this, TQ_SLOT(restoreText()), actionCollection(),
 										CResMgr::displaywindows::writeWindow::restoreText::actionName
 									   );
 	m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip );
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
index 08960a0..63cdbfa 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
@@ -81,12 +81,12 @@ void CLexiconReadWindow::initActions() {
 
 	new TDEAction(
 		i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel,
-		this, TQT_SLOT( nextEntry() ),
+		this, TQ_SLOT( nextEntry() ),
 		actionCollection(), "nextEntry"
 	);
 	new TDEAction(
 		i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel,
-		this, TQT_SLOT( previousEntry() ),
+		this, TQ_SLOT( previousEntry() ),
 		actionCollection(), "previousEntry"
 	);
 
@@ -96,29 +96,29 @@ void CLexiconReadWindow::initActions() {
 	m_actions.findText = actionCollection()->action("findText");
 	Q_ASSERT(m_actions.findText);
 	
-	//m_actions.findStrongs = new TDEAction(i18n("Strong's Search"), TDEShortcut(0),this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs");
+	//m_actions.findStrongs = new TDEAction(i18n("Strong's Search"), TDEShortcut(0),this, TQ_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs");
 	m_actions.findStrongs = new TDEAction(
 		i18n("Strong's Search"),
 		CResMgr::displaywindows::general::findStrongs::icon,
 		CResMgr::displaywindows::general::findStrongs::accel,
-		this, TQT_SLOT(openSearchStrongsDialog()),
+		this, TQ_SLOT(openSearchStrongsDialog()),
 		actionCollection(),
 		CResMgr::displaywindows::general::findStrongs::actionName);
 
-	m_actions.copy.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
+	m_actions.copy.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
 
-	m_actions.copy.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAll()), actionCollection(), "copyEntryWithText");
+	m_actions.copy.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(copyAll()), actionCollection(), "copyEntryWithText");
 
 	m_actions.copy.selectedText = actionCollection()->action("copySelectedText");
 	Q_ASSERT(m_actions.copy.selectedText);
 
-	m_actions.save.entryAsPlain = new TDEAction(i18n("Entry as plain text"), TDEShortcut(0), this, TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
+	m_actions.save.entryAsPlain = new TDEAction(i18n("Entry as plain text"), TDEShortcut(0), this, TQ_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
 
-	m_actions.save.entryAsHTML = new TDEAction(i18n("Entry as HTML"), TDEShortcut(0), this, TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
+	m_actions.save.entryAsHTML = new TDEAction(i18n("Entry as HTML"), TDEShortcut(0), this, TQ_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
 
-	m_actions.print.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
+	m_actions.print.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
 
-	m_actions.print.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printEntryWithText");
+	m_actions.print.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), this, TQ_SLOT(printAll()), actionCollection(), "printEntryWithText");
 
 	// init with the user defined settings
 	CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection());
@@ -128,27 +128,27 @@ void CLexiconReadWindow::initActions() {
 void CLexiconReadWindow::initConnections() {
 	Q_ASSERT(keyChooser());
 
-	connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
-			this, TQT_SLOT(lookup(CSwordKey*)));
-	connect(keyChooser(), TQT_SIGNAL(historyChanged()),
-			this, TQT_SLOT(slotUpdateHistoryButtons()));
+	connect(keyChooser(), TQ_SIGNAL(keyChanged(CSwordKey*)),
+			this, TQ_SLOT(lookup(CSwordKey*)));
+	connect(keyChooser(), TQ_SIGNAL(historyChanged()),
+			this, TQ_SLOT(slotUpdateHistoryButtons()));
 
 	//connect the history actions to the right slots
 	connect(
-		m_actions.backInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()),
-		this, TQT_SLOT(slotFillBackHistory())
+		m_actions.backInHistory->popupMenu(), TQ_SIGNAL(aboutToShow()),
+		this, TQ_SLOT(slotFillBackHistory())
 	);
 	connect(
-		m_actions.backInHistory->popupMenu(), TQT_SIGNAL(activated(int)),
-		keyChooser(), TQT_SLOT(backInHistory(int))
+		m_actions.backInHistory->popupMenu(), TQ_SIGNAL(activated(int)),
+		keyChooser(), TQ_SLOT(backInHistory(int))
 	);
 	connect(
-		m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()),
-		this, TQT_SLOT(slotFillForwardHistory())
+		m_actions.forwardInHistory->popupMenu(), TQ_SIGNAL(aboutToShow()),
+		this, TQ_SLOT(slotFillForwardHistory())
 	);
 	connect(
-		m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(activated(int)),
-		keyChooser(), TQT_SLOT(forwardInHistory(int))
+		m_actions.forwardInHistory->popupMenu(), TQ_SIGNAL(activated(int)),
+		keyChooser(), TQ_SLOT(forwardInHistory(int))
 	);
 
 
@@ -199,7 +199,7 @@ void CLexiconReadWindow::initToolbars() {
 void CLexiconReadWindow::setupPopupMenu() {
 	popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window"));
 
-	//   m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection());
+	//   m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(selectAll()), actionCollection());
 	m_actions.findText->plug(popup());
 	m_actions.findStrongs->plug(popup());
 	
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
index 52fff62..8a02c37 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
+++ b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
@@ -44,12 +44,12 @@ CModuleChooserButton* const CModuleChooserBar::addButton( CSwordModuleInfo* cons
 	insertWidget( m_idCounter, b->size().width(), b );
 	m_buttonList.append(b);
 
-	connect( b, TQT_SIGNAL(sigAddButton()), this, TQT_SLOT(addButton()) );
+	connect( b, TQ_SIGNAL(sigAddButton()), this, TQ_SLOT(addButton()) );
 
-	connect( b, TQT_SIGNAL(sigRemoveButton(const int)), this, TQT_SLOT(removeButton(const int)) );
+	connect( b, TQ_SIGNAL(sigRemoveButton(const int)), this, TQ_SLOT(removeButton(const int)) );
 
-	connect( b, TQT_SIGNAL(sigChanged()), TQT_SIGNAL(sigChanged()) );
-	connect( b, TQT_SIGNAL(sigChanged()), TQT_SLOT(updateMenuItems()) );
+	connect( b, TQ_SIGNAL(sigChanged()), TQ_SIGNAL(sigChanged()) );
+	connect( b, TQ_SIGNAL(sigChanged()), TQ_SLOT(updateMenuItems()) );
 
 	b->show();
 
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
index deb1c6d..9e59376 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
@@ -162,7 +162,7 @@ void CModuleChooserButton::populateMenu() {
 	}
 
 	m_popup->insertSeparator();
-	connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int)));
+	connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleChosen(int)));
 	setPopup(m_popup, true);
 
 	TQStringList languages;
@@ -203,7 +203,7 @@ void CModuleChooserButton::populateMenu() {
 			TDEPopupMenu* menu = new TDEPopupMenu;
 			langdict.insert(lang, menu );
 			m_submenus.append(menu);
-			connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int)));
+			connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleChosen(int)));
 		}
 	}
 
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
index 9f24e90..62c6438 100644
--- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
@@ -65,7 +65,7 @@ void CPlainWriteWindow::initToolbars() {
 	m_actions.saveText = new TDEAction(i18n("Save text"),
 									 CResMgr::displaywindows::writeWindow::saveText::icon,
 									 CResMgr::displaywindows::writeWindow::saveText::accel,
-									 this, TQT_SLOT(saveCurrentText()),
+									 this, TQ_SLOT(saveCurrentText()),
 									 actionCollection(),
 									 CResMgr::displaywindows::writeWindow::saveText::actionName
 									);
@@ -76,7 +76,7 @@ void CPlainWriteWindow::initToolbars() {
 	m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"),
 										CResMgr::displaywindows::writeWindow::deleteEntry::icon,
 										CResMgr::displaywindows::writeWindow::deleteEntry::accel,
-										this, TQT_SLOT(deleteEntry()),
+										this, TQ_SLOT(deleteEntry()),
 										actionCollection(),
 										CResMgr::displaywindows::writeWindow::deleteEntry::actionName
 									   );
@@ -87,7 +87,7 @@ void CPlainWriteWindow::initToolbars() {
 	m_actions.restoreText = new TDEAction(i18n("Restore original text"),
 										CResMgr::displaywindows::writeWindow::restoreText::icon,
 										CResMgr::displaywindows::writeWindow::restoreText::accel,
-										this, TQT_SLOT(restoreText()),
+										this, TQ_SLOT(restoreText()),
 										actionCollection(),
 										CResMgr::displaywindows::writeWindow::restoreText::actionName
 									   );
@@ -97,11 +97,11 @@ void CPlainWriteWindow::initToolbars() {
 
 void CPlainWriteWindow::initConnections() {
 	CWriteWindow::initConnections();
-	connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
-			this, TQT_SLOT(lookup(CSwordKey*)));
+	connect(keyChooser(), TQ_SIGNAL(keyChanged(CSwordKey*)),
+			this, TQ_SLOT(lookup(CSwordKey*)));
 
-	connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()),
-			this, TQT_SLOT(textChanged()) );
+	connect(displayWidget()->connectionsProxy(), TQ_SIGNAL(textChanged()),
+			this, TQ_SLOT(textChanged()) );
 }
 
 void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
diff --git a/bibletime/frontend/displaywindow/creadwindow.cpp b/bibletime/frontend/displaywindow/creadwindow.cpp
index 0292274..09d0f66 100644
--- a/bibletime/frontend/displaywindow/creadwindow.cpp
+++ b/bibletime/frontend/displaywindow/creadwindow.cpp
@@ -55,24 +55,24 @@ CReadDisplay* const CReadWindow::displayWidget() {
 void CReadWindow::setDisplayWidget( CReadDisplay* newDisplay ) {
 	CDisplayWindow::setDisplayWidget(newDisplay);
 	if (m_displayWidget) {
-		disconnect(m_displayWidget->connectionsProxy(), TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)), this, TQT_SLOT(lookup(const TQString&, const TQString&)));
+		disconnect(m_displayWidget->connectionsProxy(), TQ_SIGNAL(referenceClicked(const TQString&, const TQString&)), this, TQ_SLOT(lookup(const TQString&, const TQString&)));
 
-		disconnect(m_displayWidget->connectionsProxy(), TQT_SIGNAL(referenceDropped(const TQString&)), this, TQT_SLOT(lookup(const TQString&)));
+		disconnect(m_displayWidget->connectionsProxy(), TQ_SIGNAL(referenceDropped(const TQString&)), this, TQ_SLOT(lookup(const TQString&)));
 	}
 
 	m_displayWidget = newDisplay;
 	connect(
 		m_displayWidget->connectionsProxy(),
-		TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)),
+		TQ_SIGNAL(referenceClicked(const TQString&, const TQString&)),
 		this,
-		TQT_SLOT(lookup(const TQString&, const TQString&))
+		TQ_SLOT(lookup(const TQString&, const TQString&))
 	);
 
 	connect(
 		m_displayWidget->connectionsProxy(),
-		TQT_SIGNAL(referenceDropped(const TQString&)),
+		TQ_SIGNAL(referenceDropped(const TQString&)),
 		this,
-		TQT_SLOT(lookup(const TQString&))
+		TQ_SLOT(lookup(const TQString&))
 	);
 }
 
diff --git a/bibletime/frontend/displaywindow/cwritewindow.cpp b/bibletime/frontend/displaywindow/cwritewindow.cpp
index ece83bd..7b1881a 100644
--- a/bibletime/frontend/displaywindow/cwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/cwritewindow.cpp
@@ -42,8 +42,8 @@ void CWriteWindow::initConnections() {
 	//  tqWarning("CWriteWindow::initConnections()");
 	Q_ASSERT(keyChooser());
 
-	connect(keyChooser(), TQT_SIGNAL(beforeKeyChange(const TQString&)),
-			this, TQT_SLOT(beforeKeyChange(const TQString&))
+	connect(keyChooser(), TQ_SIGNAL(beforeKeyChange(const TQString&)),
+			this, TQ_SLOT(beforeKeyChange(const TQString&))
 		   );
 };
 
diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.cpp b/bibletime/frontend/keychooser/cbiblekeychooser.cpp
index 414b355..296751e 100644
--- a/bibletime/frontend/keychooser/cbiblekeychooser.cpp
+++ b/bibletime/frontend/keychooser/cbiblekeychooser.cpp
@@ -44,7 +44,7 @@ m_key(dynamic_cast<CSwordVerseKey*>(key)) {
 	w_ref = new CKeyReferenceWidget(dynamic_cast<CSwordBibleModuleInfo*>(m_modules.first()), m_key, this);
 	layout->addWidget(w_ref);
 
-	connect(w_ref,TQT_SIGNAL(changed(CSwordVerseKey *)),TQT_SLOT(refChanged(CSwordVerseKey *)));
+	connect(w_ref,TQ_SIGNAL(changed(CSwordVerseKey *)),TQ_SLOT(refChanged(CSwordVerseKey *)));
 
 	setKey(m_key); //set the key without changing it, setKey(key()) would change it
 }
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.cpp b/bibletime/frontend/keychooser/cbookkeychooser.cpp
index d9659c1..5f218bf 100644
--- a/bibletime/frontend/keychooser/cbookkeychooser.cpp
+++ b/bibletime/frontend/keychooser/cbookkeychooser.cpp
@@ -162,8 +162,8 @@ void CBookKeyChooser::setModules(const ListCSwordModuleInfo& modules, const bool
 			w->comboBox()->setMaximumWidth(maxWidth);
 			w->comboBox()->setCurrentItem(0);
 
-			connect(w, TQT_SIGNAL(changed(int)), TQT_SLOT(keyChooserChanged(int)));
-			connect(w, TQT_SIGNAL(focusOut(int)), TQT_SLOT(keyChooserChanged(int)));
+			connect(w, TQ_SIGNAL(changed(int)), TQ_SLOT(keyChooserChanged(int)));
+			connect(w, TQ_SIGNAL(focusOut(int)), TQ_SLOT(keyChooserChanged(int)));
 
 			m_layout->addWidget(w);
 			boxes[w] = i;
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.cpp b/bibletime/frontend/keychooser/cbooktreechooser.cpp
index fc93630..143eb9a 100644
--- a/bibletime/frontend/keychooser/cbooktreechooser.cpp
+++ b/bibletime/frontend/keychooser/cbooktreechooser.cpp
@@ -144,7 +144,7 @@ m_key( dynamic_cast<CSwordTreeKey*>(key) ) {
 	m_treeView->setSorting(-1);
 	m_treeView->setRootIsDecorated(true);
 	m_treeView->setFullWidth(true);
-	connect(m_treeView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(itemActivated(TQListViewItem*)));
+	connect(m_treeView, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(itemActivated(TQListViewItem*)));
 
 	setKey(key);
 	adjustFont();
diff --git a/bibletime/frontend/keychooser/ckeychooser.cpp b/bibletime/frontend/keychooser/ckeychooser.cpp
index 41a3a2e..19ea963 100644
--- a/bibletime/frontend/keychooser/ckeychooser.cpp
+++ b/bibletime/frontend/keychooser/ckeychooser.cpp
@@ -145,7 +145,7 @@ void CKeyChooser::polish() {
 	TQWidget::polish();
 
 	//connect the history calls just before we show, we want an empty history
-	connect(this, TQT_SIGNAL(keyChanged(CSwordKey*)), TQT_SLOT(addToHistory(CSwordKey*)));
+	connect(this, TQ_SIGNAL(keyChanged(CSwordKey*)), TQ_SLOT(addToHistory(CSwordKey*)));
 }
 
 #include "ckeychooser.moc"
diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.cpp b/bibletime/frontend/keychooser/ckeychooserwidget.cpp
index c711cc0..1bfc9f4 100644
--- a/bibletime/frontend/keychooser/ckeychooserwidget.cpp
+++ b/bibletime/frontend/keychooser/ckeychooserwidget.cpp
@@ -200,14 +200,14 @@ void CKeyChooserWidget::init() {
 
 	setTabOrder(m_comboBox, 0);
 
-	connect(m_scroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(lock()));
-	connect(m_scroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(unlock()));
-	connect(m_scroller, TQT_SIGNAL(change(int)), TQT_SLOT(changeCombo(int)) );
-
-	connect(m_comboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboChanged(int)));
-	//  connect(m_comboBox, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotReturnPressed(const TQString&)));
-	connect(m_comboBox->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));
-	connect(m_comboBox, TQT_SIGNAL(focusOut(int)), TQT_SIGNAL(focusOut(int)));
+	connect(m_scroller, TQ_SIGNAL(scroller_pressed()), TQ_SLOT(lock()));
+	connect(m_scroller, TQ_SIGNAL(scroller_released()), TQ_SLOT(unlock()));
+	connect(m_scroller, TQ_SIGNAL(change(int)), TQ_SLOT(changeCombo(int)) );
+
+	connect(m_comboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboChanged(int)));
+	//  connect(m_comboBox, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotReturnPressed(const TQString&)));
+	connect(m_comboBox->lineEdit(), TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
+	connect(m_comboBox, TQ_SIGNAL(focusOut(int)), TQ_SIGNAL(focusOut(int)));
 
 	updatelock = false;
 	isResetting = false;
diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp
index fbc6d31..ebbd7a5 100644
--- a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp
+++ b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp
@@ -92,7 +92,7 @@ CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVers
 	erase_picture.setIconName("locationbar_erase");
 	KPushButton *clearRef = new KPushButton(this);
 	clearRef->setGuiItem(erase_picture);
-	connect(clearRef, TQT_SIGNAL(clicked( ) ), TQT_SLOT(slotClearRef( )));
+	connect(clearRef, TQ_SIGNAL(clicked( ) ), TQ_SLOT(slotClearRef( )));
 
 	m_bookScroller = new CScrollerWidgetSet(this);
 
@@ -131,16 +131,16 @@ CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVers
 
 	// signals and slots connections
 
-	connect(m_bookScroller, TQT_SIGNAL(change(int)), TQT_SLOT(slotBookChange(int)));
-	connect(m_bookScroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(slotUpdateLock()));
-	connect(m_bookScroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(slotUpdateUnlock()));
-	connect(m_textbox, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));
-	connect(m_chapterScroller, TQT_SIGNAL(change(int)), TQT_SLOT(slotChapterChange(int)));
-	connect(m_chapterScroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(slotUpdateLock()));
-	connect(m_chapterScroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(slotUpdateUnlock()));
-	connect(m_verseScroller, TQT_SIGNAL(change(int)), TQT_SLOT(slotVerseChange(int)));
-	connect(m_verseScroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(slotUpdateLock()));
-	connect(m_verseScroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(slotUpdateUnlock()));
+	connect(m_bookScroller, TQ_SIGNAL(change(int)), TQ_SLOT(slotBookChange(int)));
+	connect(m_bookScroller, TQ_SIGNAL(scroller_pressed()), TQ_SLOT(slotUpdateLock()));
+	connect(m_bookScroller, TQ_SIGNAL(scroller_released()), TQ_SLOT(slotUpdateUnlock()));
+	connect(m_textbox, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
+	connect(m_chapterScroller, TQ_SIGNAL(change(int)), TQ_SLOT(slotChapterChange(int)));
+	connect(m_chapterScroller, TQ_SIGNAL(scroller_pressed()), TQ_SLOT(slotUpdateLock()));
+	connect(m_chapterScroller, TQ_SIGNAL(scroller_released()), TQ_SLOT(slotUpdateUnlock()));
+	connect(m_verseScroller, TQ_SIGNAL(change(int)), TQ_SLOT(slotVerseChange(int)));
+	connect(m_verseScroller, TQ_SIGNAL(scroller_pressed()), TQ_SLOT(slotUpdateLock()));
+	connect(m_verseScroller, TQ_SIGNAL(scroller_released()), TQ_SLOT(slotUpdateUnlock()));
 }
 
 void CKeyReferenceWidget::setModule(CSwordBibleModuleInfo *m) {
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
index 22cdebc..c6541cf 100644
--- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp
+++ b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
@@ -61,8 +61,8 @@ m_key(dynamic_cast<CSwordLDKey*>(key)) {
 
 	m_layout->addWidget(m_widget,0,TQt::AlignLeft);
 
-	connect(m_widget,TQT_SIGNAL(changed(int)),TQT_SLOT(activated(int)));
-	connect(m_widget,TQT_SIGNAL(focusOut(int)),TQT_SLOT(activated(int)));
+	connect(m_widget,TQ_SIGNAL(changed(int)),TQ_SLOT(activated(int)));
+	connect(m_widget,TQ_SIGNAL(focusOut(int)),TQ_SLOT(activated(int)));
 
 	setModules(modules, true);
 	setKey(key);
diff --git a/bibletime/frontend/keychooser/crefselectdialog.cpp b/bibletime/frontend/keychooser/crefselectdialog.cpp
index bd9489d..949c0b3 100644
--- a/bibletime/frontend/keychooser/crefselectdialog.cpp
+++ b/bibletime/frontend/keychooser/crefselectdialog.cpp
@@ -47,8 +47,8 @@
 //   m_oldParent = NULL;
 //   setMainWidget(m_page);
 //
-//   connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotPressedOk()));
-//   connect(this, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotPressedCancel()));
+//   connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotPressedOk()));
+//   connect(this, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotPressedCancel()));
 //}
 //
 //CRefSelectDialog::~CRefSelectDialog() {
diff --git a/bibletime/frontend/keychooser/cscrollbutton.cpp b/bibletime/frontend/keychooser/cscrollbutton.cpp
index a174471..bf6a44c 100644
--- a/bibletime/frontend/keychooser/cscrollbutton.cpp
+++ b/bibletime/frontend/keychooser/cscrollbutton.cpp
@@ -26,8 +26,8 @@ CScrollButton::CScrollButton(TQWidget *parent, const char *name ) : TQToolButton
 	setCursor( splitVCursor );
 
 	m_isLocked = false;
-	connect(this, TQT_SIGNAL(pressed() ), TQT_SLOT(was_pressed() ));
-	connect(this, TQT_SIGNAL(released()), TQT_SLOT(was_released()));
+	connect(this, TQ_SIGNAL(pressed() ), TQ_SLOT(was_pressed() ));
+	connect(this, TQ_SIGNAL(released()), TQ_SLOT(was_released()));
 }
 
 const bool CScrollButton::isLocked( ) const {
diff --git a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp b/bibletime/frontend/keychooser/cscrollerwidgetset.cpp
index 1b75462..32d7cc8 100644
--- a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp
+++ b/bibletime/frontend/keychooser/cscrollerwidgetset.cpp
@@ -57,11 +57,11 @@ CScrollerWidgetSet::CScrollerWidgetSet(TQWidget *parent, const char *name) : TQW
 	m_layout->addWidget( btn_down,0 );
 	setMinimumWidth(WIDTH+4); // Kludge to add some spacing but seems to work.
 
-	connect(btn_fx, TQT_SIGNAL(lock()), TQT_SLOT(slotLock()));
-	connect(btn_fx, TQT_SIGNAL(unlock()), TQT_SLOT(slotUnlock()));
-	connect(btn_fx, TQT_SIGNAL(change_requested(int)), TQT_SLOT(slotScroller(int)));
-	connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUpClick()));
-	connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownClick()));
+	connect(btn_fx, TQ_SIGNAL(lock()), TQ_SLOT(slotLock()));
+	connect(btn_fx, TQ_SIGNAL(unlock()), TQ_SLOT(slotUnlock()));
+	connect(btn_fx, TQ_SIGNAL(change_requested(int)), TQ_SLOT(slotScroller(int)));
+	connect(btn_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUpClick()));
+	connect(btn_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDownClick()));
 }
 
 /** Sets the tooltips for the given entries using the parameters as text. */
diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp
index 3544b4a..e6f5c62 100644
--- a/bibletime/frontend/mainindex/cmainindex.cpp
+++ b/bibletime/frontend/mainindex/cmainindex.cpp
@@ -146,24 +146,24 @@ void CMainIndex::initView() {
 	m_popup = new TDEPopupMenu(viewport());
 	m_popup->insertTitle(i18n("Bookshelf"));
 
-	m_actions.newFolder = new TDEAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, this, TQT_SLOT(createNewFolder()), this);
-	m_actions.changeFolder = new TDEAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, this, TQT_SLOT(changeFolder()), this);
+	m_actions.newFolder = new TDEAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, this, TQ_SLOT(createNewFolder()), this);
+	m_actions.changeFolder = new TDEAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, this, TQ_SLOT(changeFolder()), this);
 
-	m_actions.changeBookmark = new TDEAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, this, TQT_SLOT(changeBookmark()), this);
-	m_actions.importBookmarks = new TDEAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, this, TQT_SLOT(importBookmarks()), this);
-	m_actions.exportBookmarks = new TDEAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, this, TQT_SLOT(exportBookmarks()), this);
-	m_actions.printBookmarks = new TDEAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, this, TQT_SLOT(printBookmarks()), this);
+	m_actions.changeBookmark = new TDEAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, this, TQ_SLOT(changeBookmark()), this);
+	m_actions.importBookmarks = new TDEAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, this, TQ_SLOT(importBookmarks()), this);
+	m_actions.exportBookmarks = new TDEAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, this, TQ_SLOT(exportBookmarks()), this);
+	m_actions.printBookmarks = new TDEAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, this, TQ_SLOT(printBookmarks()), this);
 
-	m_actions.deleteEntries = new TDEAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, TQT_SLOT(deleteEntries()), this);
+	m_actions.deleteEntries = new TDEAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, TQ_SLOT(deleteEntries()), this);
 
 	m_actions.editModuleMenu = new TDEActionMenu(i18n("Edit this work"),CResMgr::mainIndex::editModuleMenu::icon, this);
 	m_actions.editModuleMenu->setDelayed(false);
-	m_actions.editModulePlain = new TDEAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, this, TQT_SLOT(editModulePlain()), this);
-	m_actions.editModuleHTML = new TDEAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, this, TQT_SLOT(editModuleHTML()), this);
+	m_actions.editModulePlain = new TDEAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, this, TQ_SLOT(editModulePlain()), this);
+	m_actions.editModuleHTML = new TDEAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, this, TQ_SLOT(editModuleHTML()), this);
 	
-	m_actions.searchInModules = new TDEAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, this, TQT_SLOT(searchInModules()), this);
-	m_actions.unlockModule = new TDEAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, this, TQT_SLOT(unlockModule()), this);
-	m_actions.aboutModule = new TDEAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, this, TQT_SLOT(aboutModule()), this);
+	m_actions.searchInModules = new TDEAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, this, TQ_SLOT(searchInModules()), this);
+	m_actions.unlockModule = new TDEAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, this, TQ_SLOT(unlockModule()), this);
+	m_actions.aboutModule = new TDEAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, this, TQ_SLOT(aboutModule()), this);
 
 
 	//fill the popup menu itself
@@ -188,16 +188,16 @@ void CMainIndex::initView() {
 	m_actions.aboutModule->plug(m_popup);
 }
 
-/** Initialize the SIGNAL<->TQT_SLOT connections */
+/** Initialize the signal<->slot connections */
 void CMainIndex::initConnections() {
-	connect(this, TQT_SIGNAL(executed(TQListViewItem*)),
-			TQT_SLOT(slotExecuted(TQListViewItem*)));
-	connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
-			TQT_SLOT(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
-	connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-			TQT_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
-	connect(&m_autoOpenTimer, TQT_SIGNAL(timeout()),
-			this, TQT_SLOT(autoOpenTimeout()));
+	connect(this, TQ_SIGNAL(executed(TQListViewItem*)),
+			TQ_SLOT(slotExecuted(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
+			TQ_SLOT(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
+	connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+			TQ_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+	connect(&m_autoOpenTimer, TQ_SIGNAL(timeout()),
+			this, TQ_SLOT(autoOpenTimeout()));
 }
 
 /** Is called when an item was clicked/double clicked. */
diff --git a/bibletime/frontend/mainindex/cmainindex.h b/bibletime/frontend/mainindex/cmainindex.h
index 3341142..10a8afb 100644
--- a/bibletime/frontend/mainindex/cmainindex.h
+++ b/bibletime/frontend/mainindex/cmainindex.h
@@ -81,7 +81,7 @@ protected: // Protected methods
 	*/
 	virtual void addGroup( const CItemBase::Type type, const TQString language);
 	/**
-	* Initialize the SIGNAL<->TQT_SLOT connections
+	* Initialize the signal<->slot connections
 	*/
 	void initConnections();
 	/**
diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.cpp b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
index 27160aa..f6a7b81 100644
--- a/bibletime/frontend/searchdialog/cmoduleresultview.cpp
+++ b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
@@ -62,23 +62,23 @@ void CModuleResultView::initView() {
 
 	m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon, m_popup);
 	m_actions.copyMenu->setDelayed(false);
-	m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(copyResult()), this);
+	m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(copyResult()), this);
 	m_actions.copyMenu->insert(m_actions.copy.result);
-	m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(copyResultWithText()), this);
+	m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(copyResultWithText()), this);
 	m_actions.copyMenu->insert(m_actions.copy.resultWithText);
 	m_actions.copyMenu->plug(m_popup);
 
 	m_actions.saveMenu = new TDEActionMenu(i18n("Save..."), CResMgr::searchdialog::result::moduleList::saveMenu::icon, m_popup);
 	m_actions.saveMenu->setDelayed( false );
-	m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(saveResult()), this);
+	m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(saveResult()), this);
 	m_actions.saveMenu->insert(m_actions.save.result);
-	m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(saveResultWithText()), this);
+	m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(saveResultWithText()), this);
 	m_actions.saveMenu->insert(m_actions.save.resultWithText);
 	m_actions.saveMenu->plug(m_popup);
 
 	m_actions.printMenu = new TDEActionMenu(i18n("Print..."), CResMgr::searchdialog::result::moduleList::printMenu::icon, m_popup);
 	m_actions.printMenu->setDelayed(false);
-	m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(printResult()), this);
+	m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(printResult()), this);
 	m_actions.printMenu->insert(m_actions.print.result);
 
 
@@ -87,10 +87,10 @@ void CModuleResultView::initView() {
 
 /** Initializes the connections of this widget, */
 void CModuleResultView::initConnections() {
-	connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-			this, TQT_SLOT(executed(TQListViewItem*)));
-	connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-			this, TQT_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
+	connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+			this, TQ_SLOT(executed(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+			this, TQ_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
 }
 
 /** Setups the tree using the given list of modules. */
diff --git a/bibletime/frontend/searchdialog/crangechooser.cpp b/bibletime/frontend/searchdialog/crangechooser.cpp
index 86bcee8..cff4db6 100644
--- a/bibletime/frontend/searchdialog/crangechooser.cpp
+++ b/bibletime/frontend/searchdialog/crangechooser.cpp
@@ -108,11 +108,11 @@ void CRangeChooserDialog::initView() {
 	grid->addMultiCellWidget(m_rangeList,0,4,0,1);
 
 	m_newRangeButton = new TQPushButton(i18n("Add new range"),plainPage());
-	connect(m_newRangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewRange()));
+	connect(m_newRangeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewRange()));
 	grid->addWidget(m_newRangeButton,5,0);
 
 	m_deleteRangeButton = new TQPushButton(i18n("Delete current range"),plainPage());
-	connect(m_deleteRangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentRange()));
+	connect(m_deleteRangeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentRange()));
 	grid->addWidget(m_deleteRangeButton,5,1);
 
 	grid->addColSpacing(2, 5);
@@ -147,16 +147,16 @@ void CRangeChooserDialog::initView() {
 
 /** Initializes the connections of this widget. */
 void CRangeChooserDialog::initConnections() {
-	connect(m_rangeList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-			this, TQT_SLOT(editRange(TQListViewItem*)));
+	connect(m_rangeList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+			this, TQ_SLOT(editRange(TQListViewItem*)));
 
-	connect(m_rangeEdit, TQT_SIGNAL(textChanged()),
-			this, TQT_SLOT(parseRange()));
-	connect(m_rangeEdit, TQT_SIGNAL(textChanged()),
-			this, TQT_SLOT(rangeChanged()));
+	connect(m_rangeEdit, TQ_SIGNAL(textChanged()),
+			this, TQ_SLOT(parseRange()));
+	connect(m_rangeEdit, TQ_SIGNAL(textChanged()),
+			this, TQ_SLOT(rangeChanged()));
 
-	connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
-			this, TQT_SLOT(nameChanged(const TQString&)));
+	connect(m_nameEdit, TQ_SIGNAL(textChanged(const TQString&)),
+			this, TQ_SLOT(nameChanged(const TQString&)));
 }
 
 /** Adds a new range to the list. */
diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp
index aef9410..996026b 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.cpp
+++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp
@@ -94,10 +94,10 @@ void CSearchAnalysisDialog::initView() {
 	m_analysisView->show();
 	layout->addWidget(m_analysisView);
 
-	connect(button, TQT_SIGNAL(clicked()), m_analysis, TQT_SLOT(saveAsHTML()));
+	connect(button, TQ_SIGNAL(clicked()), m_analysis, TQ_SLOT(saveAsHTML()));
 }
 
-/** Initializes the widgets TQT_SIGNAL and TQT_SLOT connections,. */
+/** Initializes the widgets signal and slot connections. */
 void CSearchAnalysisDialog::initConnections() {}
 
 /****************************/
@@ -113,7 +113,7 @@ CSearchAnalysis::CSearchAnalysis(TQObject *parent, const char *name )
 	m_canvasItemList.resize(67);
 	m_canvasItemList.setAutoDelete(true);
 	resize(1,1);
-	connect(this, TQT_SIGNAL(resized()), TQT_SLOT(slotResized()));
+	connect(this, TQ_SIGNAL(resized()), TQ_SLOT(slotResized()));
 }
 
 CSearchAnalysis::~CSearchAnalysis() {}
diff --git a/bibletime/frontend/searchdialog/csearchanalysis.h b/bibletime/frontend/searchdialog/csearchanalysis.h
index 6a2d8f1..c14b397 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.h
+++ b/bibletime/frontend/searchdialog/csearchanalysis.h
@@ -109,7 +109,7 @@ public:
 
 protected: // Protected methods
 	/**
-	 * Initializes the widgets TQT_SIGNAL and TQT_SLOT connections,.
+	 * Initializes the widgets signal and slot connections.
 	 */
 	void initConnections();
 	
diff --git a/bibletime/frontend/searchdialog/csearchdialog.cpp b/bibletime/frontend/searchdialog/csearchdialog.cpp
index 199167a..8acbf41 100644
--- a/bibletime/frontend/searchdialog/csearchdialog.cpp
+++ b/bibletime/frontend/searchdialog/csearchdialog.cpp
@@ -87,7 +87,7 @@ CSearchDialog::CSearchDialog(TQWidget *parent)
 	setWFlags( getWFlags() | TQt::WStyle_MinMax );
 	setIcon(CResMgr::searchdialog::icon);
 
-	m_searcher.connectFinished( this, TQT_SLOT(searchFinished()));
+	m_searcher.connectFinished( this, TQ_SLOT(searchFinished()));
 
 	initView();
 	initConnections();
@@ -244,8 +244,8 @@ void CSearchDialog::showModulesSelector() {
 
 /** Initializes the signal slot connections */
 void CSearchDialog::initConnections() {
-	connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(startSearch()));
-	connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(slotDelayedDestruct()));
+	connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(startSearch()));
+	connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(slotDelayedDestruct()));
 }
 
 /** Resets the parts to the default. */
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.cpp b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
index b1e6012..e691f6d 100644
--- a/bibletime/frontend/searchdialog/csearchdialogpages.cpp
+++ b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
@@ -553,16 +553,16 @@ const TQString CSearchResultPage::highlightSearchedText(const TQString& content,
 
 /** Initializes the signal slot conections of the child widgets, */
 void CSearchResultPage::initConnections() {
-	connect(m_resultListBox, TQT_SIGNAL(keySelected(const TQString&)),
-			this, TQT_SLOT(updatePreview(const TQString&)));
-	connect(m_moduleListBox, TQT_SIGNAL(moduleSelected(CSwordModuleInfo*)),
-			m_resultListBox, TQT_SLOT(setupTree(CSwordModuleInfo*)));
-	connect(m_moduleListBox, TQT_SIGNAL(moduleChanged()),
-			m_previewDisplay->connectionsProxy(), TQT_SLOT(clear()));
-	connect(m_analyseButton, TQT_SIGNAL(clicked()), TQT_SLOT(showAnalysis()));
+	connect(m_resultListBox, TQ_SIGNAL(keySelected(const TQString&)),
+			this, TQ_SLOT(updatePreview(const TQString&)));
+	connect(m_moduleListBox, TQ_SIGNAL(moduleSelected(CSwordModuleInfo*)),
+			m_resultListBox, TQ_SLOT(setupTree(CSwordModuleInfo*)));
+	connect(m_moduleListBox, TQ_SIGNAL(moduleChanged()),
+			m_previewDisplay->connectionsProxy(), TQ_SLOT(clear()));
+	connect(m_analyseButton, TQ_SIGNAL(clicked()), TQ_SLOT(showAnalysis()));
    // connect the strongs list
-   connect(m_moduleListBox, TQT_SIGNAL(strongsSelected(CSwordModuleInfo*, TQStringList*)),
-         m_resultListBox, TQT_SLOT(setupStrongsTree(CSwordModuleInfo*, TQStringList*)));
+   connect(m_moduleListBox, TQ_SIGNAL(strongsSelected(CSwordModuleInfo*, TQStringList*)),
+         m_resultListBox, TQ_SLOT(setupStrongsTree(CSwordModuleInfo*, TQStringList*)));
 }
 
 /** Shows a dialog with the search analysis of the current search. */
@@ -616,20 +616,20 @@ void CSearchOptionsPage::setSearchText(const TQString& text) {
 
 /** Initializes this page. */
 void CSearchOptionsPage::initView() {
-	connect( m_searchTextCombo, TQT_SIGNAL(activated( const TQString& )),
-				m_searchTextCombo, TQT_SLOT( addToHistory( const TQString& ))
+	connect( m_searchTextCombo, TQ_SIGNAL(activated( const TQString& )),
+				m_searchTextCombo, TQ_SLOT( addToHistory( const TQString& ))
 			);
-	connect( m_searchTextCombo, TQT_SIGNAL(returnPressed ( const TQString& )),
-				m_searchTextCombo, TQT_SLOT(addToHistory(const TQString&))
+	connect( m_searchTextCombo, TQ_SIGNAL(returnPressed ( const TQString& )),
+				m_searchTextCombo, TQ_SLOT(addToHistory(const TQString&))
 			);
 	TQToolTip::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::tooltip);
 
 	m_syntaxButton->setIconSet(SmallIconSet("contexthelp"));
-	connect( m_syntaxButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(syntaxHelp()));
+	connect( m_syntaxButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(syntaxHelp()));
 
 	m_chooseModulesButton->setIconSet(SmallIconSet("wizard"));
-	connect(m_chooseModulesButton, TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(chooseModules()));
+	connect(m_chooseModulesButton, TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(chooseModules()));
 	TQToolTip::add
 		(m_chooseModulesButton, CResMgr::searchdialog::options::moduleChooserButton::tooltip);
 		
@@ -638,8 +638,8 @@ void CSearchOptionsPage::initView() {
 	refreshRanges();
 
 	m_chooseRangeButton->setIconSet(SmallIconSet("configure"));
-	connect(m_chooseRangeButton, TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(setupRanges()));
+	connect(m_chooseRangeButton, TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(setupRanges()));
 
 	//set the initial focus
 	m_searchTextCombo->setFocus();
@@ -673,8 +673,8 @@ void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) {
 /** Opens the modules chooser dialog. */
 void CSearchOptionsPage::chooseModules() {
 	CModuleChooserDialog* dlg = new CModuleChooserDialog(this, modules());
-	connect(dlg, TQT_SIGNAL(modulesChanged(ListCSwordModuleInfo)),
-			this, TQT_SLOT(setModules(ListCSwordModuleInfo)));
+	connect(dlg, TQ_SIGNAL(modulesChanged(ListCSwordModuleInfo)),
+			this, TQ_SLOT(setModules(ListCSwordModuleInfo)));
 	dlg->exec();
 }
 
diff --git a/bibletime/frontend/searchdialog/csearchresultview.cpp b/bibletime/frontend/searchdialog/csearchresultview.cpp
index 3f28758..da9959a 100644
--- a/bibletime/frontend/searchdialog/csearchresultview.cpp
+++ b/bibletime/frontend/searchdialog/csearchresultview.cpp
@@ -50,36 +50,36 @@ void CSearchResultView::initView() {
 
 	m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon, m_popup);
 	m_actions.copyMenu->setDelayed(false);
-	m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(copyItems()), this);
+	m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(copyItems()), this);
 	m_actions.copyMenu->insert(m_actions.copy.result);
-	m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(copyItemsWithText()), this);
+	m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(copyItemsWithText()), this);
 	m_actions.copyMenu->insert(m_actions.copy.resultWithText);
 	m_actions.copyMenu->plug(m_popup);
 
 	m_actions.saveMenu = new TDEActionMenu(i18n("Save..."),CResMgr::searchdialog::result::foundItems::saveMenu::icon, m_popup);
 	m_actions.saveMenu->setDelayed( false );
-	m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(saveItems()), this);
+	m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(saveItems()), this);
 	m_actions.saveMenu->insert(m_actions.save.result);
-	m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(saveItemsWithText()), this);
+	m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(saveItemsWithText()), this);
 	m_actions.saveMenu->insert(m_actions.save.resultWithText);
 	m_actions.saveMenu->plug(m_popup);
 
 	m_actions.printMenu = new TDEActionMenu(i18n("Print..."),CResMgr::searchdialog::result::foundItems::printMenu::icon, m_popup);
 	m_actions.printMenu->setDelayed(false);
-	m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(printItems()), this);
+	m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(printItems()), this);
 	m_actions.printMenu->insert(m_actions.print.result);
 	m_actions.printMenu->plug(m_popup);
 }
 
 /** No descriptions */
 void CSearchResultView::initConnections() {
-	//  connect(this, TQT_SIGNAL(executed(TQListViewItem*)),
-	//   this, TQT_SLOT(executed(TQListViewItem*)));
-	connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-			this, TQT_SLOT(executed(TQListViewItem*)));
+	//  connect(this, TQ_SIGNAL(executed(TQListViewItem*)),
+	//   this, TQ_SLOT(executed(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+			this, TQ_SLOT(executed(TQListViewItem*)));
 
-	connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-			this, TQT_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
+	connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+			this, TQ_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
 }
 
 /** Setups the list with the given module. */