Replaced various '#define' with actual strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a9e61fd1e58f2ace02e4dc532fa06032307181e2)

17 files changed, 123 insertions, 123 deletions

diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
index cfe05e3..bd2b213 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(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
+	action = KStdAction::quit(kapp, TQT_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,
-						 TQT_TQOBJECT(this), TQT_SLOT(slotSearchModules()), actionCollection(),
+						 this, TQT_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,
-						 TQT_TQOBJECT(this), TQT_SLOT(slotSearchDefaultBible()), actionCollection(),
+						 this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT( slotToggleToolbar() ), actionCollection());
+	m_viewToolbar_action = KStdAction::showToolbar(this, TQT_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,
-							 TQT_TQOBJECT(this), TQT_SLOT(slotToggleMainIndex()), actionCollection(),
+							 this, TQT_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,
-							   TQT_TQOBJECT(this), TQT_SLOT(slotToggleInfoDisplay()), actionCollection(),
+							   this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsOptions() ), actionCollection());
+	action = KStdAction::preferences(this, TQT_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,
-						 TQT_TQOBJECT(this), TQT_SLOT( slotSwordSetupDialog() ), actionCollection(),
+						 this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsToolbar() ), actionCollection());
+	action = KStdAction::configureToolbars(this, TQT_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,
-								TQT_TQOBJECT(this), TQT_SLOT(slotManualArrangementMode()), actionCollection(),
+								this, TQT_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,
-									  TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileVertical()), actionCollection(),
+									  this, TQT_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,
-										TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileHorizontal()), actionCollection(),
+										this, TQT_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,
-								  TQT_TQOBJECT(this), TQT_SLOT(slotAutoCascade()), actionCollection(),
+								  this, TQT_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,
-										 TQT_TQOBJECT(this), TQT_SLOT(slotCascade()), actionCollection(),
+										 this, TQT_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,
-								  TQT_TQOBJECT(this), TQT_SLOT(slotTileVertical()), actionCollection(),
+								  this, TQT_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,
-									TQT_TQOBJECT(this), TQT_SLOT(slotTileHorizontal()), actionCollection(),
+									this, TQT_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,
-										  TQT_TQOBJECT(m_mdi), TQT_SLOT(deleteAll()), actionCollection(),
+										  m_mdi, TQT_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,
-									  TQT_TQOBJECT(this), TQT_SLOT(saveToNewProfile()), actionCollection(),
+									  this, TQT_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,
-								TQT_TQOBJECT(this), TQT_SLOT(toggleFullscreen()), actionCollection(),
+								this, TQT_SLOT(toggleFullscreen()), actionCollection(),
 								CResMgr::mainMenu::window::showFullscreen::actionName
 												 );
 	m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip );
@@ -413,7 +413,7 @@ void BibleTime::initActions() {
 	action = new TDEAction(i18n("&Handbook"),
 						 CResMgr::mainMenu::help::handbook::icon,
 						 CResMgr::mainMenu::help::handbook::accel,
-						 TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Handbook()), actionCollection(),
+						 this, TQT_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,
-						 TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Howto()), actionCollection(),
+						 this, TQT_SLOT(openOnlineHelp_Howto()), actionCollection(),
 						 CResMgr::mainMenu::help::bibleStudyHowTo::actionName
 						);
 	action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip );
@@ -457,7 +457,7 @@ void BibleTime::initActions() {
 	action = new TDEAction(i18n("&Daily tip"),
 						 CResMgr::mainMenu::help::dailyTip::icon,
 						 CResMgr::mainMenu::help::dailyTip::accel,
-						 TQT_TQOBJECT(this), TQT_SLOT(slotHelpTipOfDay()), actionCollection(),
+						 this, TQT_SLOT(slotHelpTipOfDay()), actionCollection(),
 						 CResMgr::mainMenu::help::dailyTip::actionName
 						);
 	action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip);
diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp
index 123eeaa..094110d 100644
--- a/bibletime/bibletime_slots.cpp
+++ b/bibletime/bibletime_slots.cpp
@@ -188,7 +188,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
 		TQWidget* w = windows.at(i);
 		Q_ASSERT(w);
 
-		KUserDataAction* action = new KUserDataAction(w->caption(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
+		KUserDataAction* action = new KUserDataAction(w->caption(), TDEShortcut(), this, TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
 		Q_ASSERT(action);
 		action->setUserData(w);
 
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
index a15c3a8..84ee39f 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -53,7 +53,7 @@
 using namespace InfoDisplay;
 
 CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, TQWidget* parentWidget)
-: TDEHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), TQT_TQOBJECT(readWindow ? readWindow : parentWidget)),
+: TDEHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), readWindow ? readWindow : parentWidget),
 CReadDisplay(readWindow),
 m_currentAnchorCache(TQString()) {
 	setDNDEnabled(false);
diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
index 536e627..18ed276 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&)), TQT_TQOBJECT(this), TQT_SLOT(setFamily(const TQString&)));
+	connect(m_actions.fontChooser, TQT_SIGNAL(activated(const TQString&)), this, TQT_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)), TQT_TQOBJECT(this), TQT_SLOT(setPointSize(int)));
+	connect(m_actions.fontSizeChooser, TQT_SIGNAL(fontSizeChanged(int)), this, TQT_SLOT(setPointSize(int)));
 
 	m_colorButton = new KColorButton(bar);
-	connect(m_colorButton, TQT_SIGNAL(changed(const TQColor&)), TQT_TQOBJECT(this), TQT_SLOT(slotColorSelected(const TQColor&)));
+	connect(m_colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_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,
-										TQT_TQOBJECT(this), TQT_SLOT(toggleBold()),
+										this, TQT_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,
-										  TQT_TQOBJECT(this), TQT_SLOT(toggleItalic()),
+										  this, TQT_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,
-						  TQT_TQOBJECT(this), TQT_SLOT(toggleUnderline()),
+						  this, TQT_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,
-						  TQT_TQOBJECT(this), TQT_SLOT( alignLeft()  ),
+						  this, TQT_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,
-							TQT_TQOBJECT(this), TQT_SLOT(alignCenter()),
+							this, TQT_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,
-						   TQT_TQOBJECT(this), TQT_SLOT(alignRight()),
+						   this, TQT_SLOT(alignRight()),
 						   actions,
 						   CResMgr::displaywindows::writeWindow::alignRight::actionName
 											);
@@ -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), TQT_TQOBJECT(this), TQT_SLOT(selectAll()), TQT_TQOBJECT(this));
+		m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), this, TQT_SLOT(selectAll()), this);
 	}
 
 	TDEPopupMenu* popup = new TDEPopupMenu(this);
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
index fa7ceb2..8df3a6e 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,
-		TQT_TQOBJECT(this), TQT_SLOT(nextBook()),
+		this, TQT_SLOT(nextBook()),
 		actionCollection(), "nextBook"
 	);
 	new TDEAction(
 		i18n("Previous book"),
 		CResMgr::displaywindows::bibleWindow::previousBook::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(previousBook()),
+		this, TQT_SLOT(previousBook()),
 		actionCollection(), "previousBook"
 	);
 	new TDEAction(
 		i18n("Next chapter"),
 		CResMgr::displaywindows::bibleWindow::nextChapter::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(nextChapter()),
+		this, TQT_SLOT(nextChapter()),
 		actionCollection(), "nextChapter"
 	);
 	new TDEAction(
 		i18n("Previous chapter"),
 		CResMgr::displaywindows::bibleWindow::previousChapter::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(previousChapter()),
+		this, TQT_SLOT(previousChapter()),
 		actionCollection(), "previousChapter"
 	);
 	new TDEAction(
 		i18n("Next verse"),
 		CResMgr::displaywindows::bibleWindow::nextVerse::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(nextVerse()),
+		this, TQT_SLOT(nextVerse()),
 		actionCollection(), "nextVerse"
 	);
 	new TDEAction(
 		i18n("Previous verse"),
 		CResMgr::displaywindows::bibleWindow::previousVerse::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(previousVerse()),
+		this, TQT_SLOT(previousVerse()),
 		actionCollection(), "previousVerse"
 	);
 
@@ -177,7 +177,7 @@ void CBibleReadWindow::initActions() {
 		i18n("Strong's Search"),
 		CResMgr::displaywindows::general::findStrongs::icon,
 		CResMgr::displaywindows::general::findStrongs::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(openSearchStrongsDialog()),
+		this, TQT_SLOT(openSearchStrongsDialog()),
 		actionCollection(),
 		CResMgr::displaywindows::general::findStrongs::actionName);
 
@@ -188,20 +188,20 @@ void CBibleReadWindow::initActions() {
 
 	m_actions.copy.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
 
-	m_actions.copy.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
+	m_actions.copy.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQT_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.chapterAsPlain = new TDEAction(i18n("Chapter as plain text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
+	m_actions.save.chapterAsPlain = new TDEAction(i18n("Chapter as plain text"), TDEShortcut(0), this, TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
 
-	m_actions.save.chapterAsHTML = new TDEAction(i18n("Chapter as HTML"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
+	m_actions.save.chapterAsHTML = new TDEAction(i18n("Chapter as HTML"), TDEShortcut(0), this, TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
 
-	m_actions.print.reference = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
+	m_actions.print.reference = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
 
-	m_actions.print.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printChapter");
+	m_actions.print.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printChapter");
 
 	CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection());
 }
@@ -232,26 +232,26 @@ void CBibleReadWindow::setupPopupMenu() {
 	m_actions.findStrongs->plug(popup());
 	m_actions.selectAll->plug(popup());
 		
-	(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
+	(new TDEActionSeparator(this))->plug( popup() );
 
-	m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, TQT_TQOBJECT(popup()));
+	m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, popup());
 	m_actions.copyMenu->setDelayed( false );
 	m_actions.copyMenu->insert(m_actions.copy.referenceOnly);
 	m_actions.copyMenu->insert(m_actions.copy.referenceTextOnly);
 	m_actions.copyMenu->insert(m_actions.copy.referenceAndText);
 	m_actions.copyMenu->insert(m_actions.copy.chapter);
-	m_actions.copyMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this)));
+	m_actions.copyMenu->insert(new TDEActionSeparator(this));
 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
 	m_actions.copyMenu->plug(popup());
 
-	m_actions.saveMenu = new TDEActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon,TQT_TQOBJECT(popup()));
+	m_actions.saveMenu = new TDEActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon,popup());
 	m_actions.saveMenu->setDelayed( false );
 	m_actions.saveMenu->insert(m_actions.save.referenceAndText);
 	m_actions.saveMenu->insert(m_actions.save.chapterAsPlain);
 	m_actions.saveMenu->insert(m_actions.save.chapterAsHTML);
 	m_actions.saveMenu->plug(popup());
 
-	m_actions.printMenu = new TDEActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, TQT_TQOBJECT(popup()));
+	m_actions.printMenu = new TDEActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, popup());
 	m_actions.printMenu->setDelayed(false);
 	m_actions.printMenu->insert(m_actions.print.reference);
 	m_actions.printMenu->insert(m_actions.print.chapter);
@@ -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, TQT_TQOBJECT(this), TQT_SLOT(syncWindows()));
+		TQTimer::singleShot(0, this, TQT_SLOT(syncWindows()));
 	}
 
 	return ret;
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
index 14def84..4da7e0d 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,
-					   TQT_TQOBJECT(this), TQT_SLOT(treeToggled()),
+					   this, TQT_SLOT(treeToggled()),
 					   actionCollection(), "toggleTree");
 
 	CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection());
@@ -93,7 +93,7 @@ void CBookReadWindow::initConnections() {
 	CLexiconReadWindow::initConnections();
 
 	connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)),
-			TQT_TQOBJECT(this), TQT_SLOT(lookup(CSwordKey*)));
+			this, TQT_SLOT(lookup(CSwordKey*)));
 	connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)),
 			keyChooser(), TQT_SLOT(updateKey(CSwordKey*)));
 	connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
index e4ed7e6..3ad9ad2 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,
-		TQT_TQOBJECT(this), TQT_SLOT(nextBook()),
+		this, TQT_SLOT(nextBook()),
 		actionCollection(), "nextBook"
 	);
 	new TDEAction(
 		i18n("Previous book"),
 		CResMgr::displaywindows::bibleWindow::previousBook::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(previousBook()),
+		this, TQT_SLOT(previousBook()),
 		actionCollection(), "previousBook"
 	);
 	new TDEAction(
 		i18n("Next chapter"),
 		CResMgr::displaywindows::bibleWindow::nextChapter::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(nextChapter()),
+		this, TQT_SLOT(nextChapter()),
 		actionCollection(), "nextChapter"
 	);
 	new TDEAction(
 		i18n("Previous chapter"),
 		CResMgr::displaywindows::bibleWindow::previousChapter::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(previousChapter()),
+		this, TQT_SLOT(previousChapter()),
 		actionCollection(), "previousChapter"
 	);
 	new TDEAction(
 		i18n("Next verse"),
 		CResMgr::displaywindows::bibleWindow::nextVerse::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(nextVerse()),
+		this, TQT_SLOT(nextVerse()),
 		actionCollection(), "nextVerse"
 	);
 	new TDEAction(
 		i18n("Previous verse"),
 		CResMgr::displaywindows::bibleWindow::previousVerse::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(previousVerse()),
+		this, TQT_SLOT(previousVerse()),
 		actionCollection(), "previousVerse"
 	);
 
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
index 93b93ff..4635899 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -161,7 +161,7 @@ void CDisplayWindow::initActions() {
 	new TDEAction(i18n("Search"),
 				CResMgr::displaywindows::general::search::icon,
 				CResMgr::displaywindows::general::search::accel,
-				TQT_TQOBJECT(this), TQT_SLOT(slotSearchInModules()),
+				this, TQT_SLOT(slotSearchInModules()),
 				actionCollection(), CResMgr::displaywindows::general::search::actionName
 			   );
 
@@ -174,7 +174,7 @@ void CDisplayWindow::initActions() {
 		actionCollection(), "zoomOut"
 	);
 	KStdAction::close(
-		TQT_TQOBJECT(this), TQT_SLOT(close()),
+		this, TQT_SLOT(close()),
 		actionCollection(), "closeWindow"
 	);
 
@@ -195,13 +195,13 @@ void CDisplayWindow::initActions() {
 
 	new TDEToolBarPopupAction(
 		i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel,
-		TQT_TQOBJECT(keyChooser()), TQT_SLOT( backInHistory() ),
+		keyChooser(), TQT_SLOT( backInHistory() ),
 		actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName
 	);
 
 	new TDEToolBarPopupAction(
 		i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel,
-		TQT_TQOBJECT(keyChooser()), TQT_SLOT( forwardInHistory() ),
+		keyChooser(), TQT_SLOT( forwardInHistory() ),
 		actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName
 	);
 
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
index 5393a42..569963c 100644
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
@@ -49,9 +49,9 @@ void CHTMLWriteWindow::initConnections() {
 	CWriteWindow::initConnections();
 
 	connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
-			TQT_TQOBJECT(this), TQT_SLOT(lookup(CSwordKey*)));
+			this, TQT_SLOT(lookup(CSwordKey*)));
 	connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()),
-			TQT_TQOBJECT(this), TQT_SLOT(textChanged()) );
+			this, TQT_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,
-									  TQT_TQOBJECT(this), TQT_SLOT( saveCurrentText()  ),
+									  this, TQT_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,
-										TQT_TQOBJECT(this), TQT_SLOT(deleteEntry()),
+										this, TQT_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,
-										TQT_TQOBJECT(this), TQT_SLOT(restoreText()), actionCollection(),
+										this, TQT_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 766751d..08960a0 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,
-		TQT_TQOBJECT(this), TQT_SLOT( nextEntry() ),
+		this, TQT_SLOT( nextEntry() ),
 		actionCollection(), "nextEntry"
 	);
 	new TDEAction(
 		i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel,
-		TQT_TQOBJECT(this), TQT_SLOT( previousEntry() ),
+		this, TQT_SLOT( previousEntry() ),
 		actionCollection(), "previousEntry"
 	);
 
@@ -101,7 +101,7 @@ void CLexiconReadWindow::initActions() {
 		i18n("Strong's Search"),
 		CResMgr::displaywindows::general::findStrongs::icon,
 		CResMgr::displaywindows::general::findStrongs::accel,
-		TQT_TQOBJECT(this), TQT_SLOT(openSearchStrongsDialog()),
+		this, TQT_SLOT(openSearchStrongsDialog()),
 		actionCollection(),
 		CResMgr::displaywindows::general::findStrongs::actionName);
 
@@ -112,13 +112,13 @@ void CLexiconReadWindow::initActions() {
 	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), TQT_TQOBJECT(this), TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
+	m_actions.save.entryAsPlain = new TDEAction(i18n("Entry as plain text"), TDEShortcut(0), this, TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
 
-	m_actions.save.entryAsHTML = new TDEAction(i18n("Entry as HTML"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
+	m_actions.save.entryAsHTML = new TDEAction(i18n("Entry as HTML"), TDEShortcut(0), this, TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
 
-	m_actions.print.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
+	m_actions.print.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
 
-	m_actions.print.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printEntryWithText");
+	m_actions.print.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printEntryWithText");
 
 	// init with the user defined settings
 	CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection());
@@ -129,14 +129,14 @@ void CLexiconReadWindow::initConnections() {
 	Q_ASSERT(keyChooser());
 
 	connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
-			TQT_TQOBJECT(this), TQT_SLOT(lookup(CSwordKey*)));
+			this, TQT_SLOT(lookup(CSwordKey*)));
 	connect(keyChooser(), TQT_SIGNAL(historyChanged()),
-			TQT_TQOBJECT(this), TQT_SLOT(slotUpdateHistoryButtons()));
+			this, TQT_SLOT(slotUpdateHistoryButtons()));
 
 	//connect the history actions to the right slots
 	connect(
 		m_actions.backInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()),
-		TQT_TQOBJECT(this), TQT_SLOT(slotFillBackHistory())
+		this, TQT_SLOT(slotFillBackHistory())
 	);
 	connect(
 		m_actions.backInHistory->popupMenu(), TQT_SIGNAL(activated(int)),
@@ -144,7 +144,7 @@ void CLexiconReadWindow::initConnections() {
 	);
 	connect(
 		m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()),
-		TQT_TQOBJECT(this), TQT_SLOT(slotFillForwardHistory())
+		this, TQT_SLOT(slotFillForwardHistory())
 	);
 	connect(
 		m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(activated(int)),
@@ -206,14 +206,14 @@ void CLexiconReadWindow::setupPopupMenu() {
 	m_actions.selectAll->plug(popup());
 
 	
-	(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
+	(new TDEActionSeparator(this))->plug( popup() );
 
 	m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::displaywindows::lexiconWindow::copyMenu::icon, actionCollection());
 	m_actions.copyMenu->setDelayed(false);
 
 	m_actions.copyMenu->insert(m_actions.copy.reference);
 	m_actions.copyMenu->insert(m_actions.copy.entry);
-	m_actions.copyMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this)));
+	m_actions.copyMenu->insert(new TDEActionSeparator(this));
 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
 	m_actions.copyMenu->plug(popup());
 
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
index c50ecb9..9f24e90 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,
-									 TQT_TQOBJECT(this), TQT_SLOT(saveCurrentText()),
+									 this, TQT_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,
-										TQT_TQOBJECT(this), TQT_SLOT(deleteEntry()),
+										this, TQT_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,
-										TQT_TQOBJECT(this), TQT_SLOT(restoreText()),
+										this, TQT_SLOT(restoreText()),
 										actionCollection(),
 										CResMgr::displaywindows::writeWindow::restoreText::actionName
 									   );
@@ -98,10 +98,10 @@ void CPlainWriteWindow::initToolbars() {
 void CPlainWriteWindow::initConnections() {
 	CWriteWindow::initConnections();
 	connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
-			TQT_TQOBJECT(this), TQT_SLOT(lookup(CSwordKey*)));
+			this, TQT_SLOT(lookup(CSwordKey*)));
 
 	connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()),
-			TQT_TQOBJECT(this), TQT_SLOT(textChanged()) );
+			this, TQT_SLOT(textChanged()) );
 }
 
 void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.cpp b/bibletime/frontend/keychooser/cbookkeychooser.cpp
index 4cc006c..d9659c1 100644
--- a/bibletime/frontend/keychooser/cbookkeychooser.cpp
+++ b/bibletime/frontend/keychooser/cbookkeychooser.cpp
@@ -166,7 +166,7 @@ void CBookKeyChooser::setModules(const ListCSwordModuleInfo& modules, const bool
 			connect(w, TQT_SIGNAL(focusOut(int)), TQT_SLOT(keyChooserChanged(int)));
 
 			m_layout->addWidget(w);
-			boxes[TQT_TQOBJECT(w)] = i;
+			boxes[w] = i;
 
 			w->show();
 		}
diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp
index 66e1ce5..3544b4a 100644
--- a/bibletime/frontend/mainindex/cmainindex.cpp
+++ b/bibletime/frontend/mainindex/cmainindex.cpp
@@ -146,37 +146,37 @@ 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, TQT_TQOBJECT(this), TQT_SLOT(createNewFolder()), TQT_TQOBJECT(this));
-	m_actions.changeFolder = new TDEAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(changeFolder()), TQT_TQOBJECT(this));
+	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.changeBookmark = new TDEAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(changeBookmark()), TQT_TQOBJECT(this));
-	m_actions.importBookmarks = new TDEAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(importBookmarks()), TQT_TQOBJECT(this));
-	m_actions.exportBookmarks = new TDEAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(exportBookmarks()), TQT_TQOBJECT(this));
-	m_actions.printBookmarks = new TDEAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(printBookmarks()), TQT_TQOBJECT(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.deleteEntries = new TDEAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(deleteEntries()), TQT_TQOBJECT(this));
+	m_actions.deleteEntries = new TDEAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, TQT_SLOT(deleteEntries()), this);
 
-	m_actions.editModuleMenu = new TDEActionMenu(i18n("Edit this work"),CResMgr::mainIndex::editModuleMenu::icon, TQT_TQOBJECT(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, TQT_TQOBJECT(this), TQT_SLOT(editModulePlain()), TQT_TQOBJECT(this));
-	m_actions.editModuleHTML = new TDEAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(editModuleHTML()), TQT_TQOBJECT(this));
+	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.searchInModules = new TDEAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(searchInModules()), TQT_TQOBJECT(this));
-	m_actions.unlockModule = new TDEAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(unlockModule()), TQT_TQOBJECT(this));
-	m_actions.aboutModule = new TDEAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), TQT_TQOBJECT(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);
 
 
 	//fill the popup menu itself
 	m_actions.newFolder->plug(m_popup);
 	m_actions.changeFolder->plug(m_popup);
-	(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug(m_popup);
+	(new TDEActionSeparator(this))->plug(m_popup);
 	m_actions.changeBookmark->plug(m_popup);
 	m_actions.importBookmarks->plug(m_popup);
 	m_actions.exportBookmarks->plug(m_popup);
 	m_actions.printBookmarks->plug(m_popup);
-	(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug(m_popup);
+	(new TDEActionSeparator(this))->plug(m_popup);
 	m_actions.deleteEntries->plug(m_popup);
-	(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug(m_popup);
+	(new TDEActionSeparator(this))->plug(m_popup);
 	m_actions.editModuleMenu->plug(m_popup);
 	//sub item of edit module menu
 	m_actions.editModuleMenu->insert(m_actions.editModulePlain); 
@@ -520,7 +520,7 @@ void CMainIndex::printBookmarks() {
 	}
 
 	util::scoped_ptr<CPrinter> printer( 
-		new CPrinter( TQT_TQOBJECT(this), CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() ) 
+		new CPrinter( this, CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() ) 
 	);
 	printer->printKeyTree(tree);
 }
diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.cpp b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
index 9cfb532..27160aa 100644
--- a/bibletime/frontend/searchdialog/cmoduleresultview.cpp
+++ b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
@@ -60,25 +60,25 @@ void CModuleResultView::initView() {
 	m_popup = new TDEPopupMenu(this);
 	// m_popup->insertTitle(i18n("Bible window"));
 
-	m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon, TQT_TQOBJECT(m_popup));
+	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), TQT_TQOBJECT(this), TQT_SLOT(copyResult()), TQT_TQOBJECT(this));
+	m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(copyResult()), this);
 	m_actions.copyMenu->insert(m_actions.copy.result);
-	m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyResultWithText()), TQT_TQOBJECT(this));
+	m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_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, TQT_TQOBJECT(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), TQT_TQOBJECT(this), TQT_SLOT(saveResult()), TQT_TQOBJECT(this));
+	m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(saveResult()), this);
 	m_actions.saveMenu->insert(m_actions.save.result);
-	m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveResultWithText()), TQT_TQOBJECT(this));
+	m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_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, TQT_TQOBJECT(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), TQT_TQOBJECT(this), TQT_SLOT(printResult()), TQT_TQOBJECT(this));
+	m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(printResult()), this);
 	m_actions.printMenu->insert(m_actions.print.result);
 
 
diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp
index 77efa5a..aef9410 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.cpp
+++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp
@@ -89,7 +89,7 @@ void CSearchAnalysisDialog::initView() {
 	layout->addWidget(button);
 	layout->addSpacing(10);
 
-	m_analysis = new CSearchAnalysis(TQT_TQOBJECT(plainPage()));
+	m_analysis = new CSearchAnalysis(plainPage());
 	m_analysisView = new CSearchAnalysisView(m_analysis, plainPage());
 	m_analysisView->show();
 	layout->addWidget(m_analysisView);
diff --git a/bibletime/frontend/searchdialog/csearchdialog.cpp b/bibletime/frontend/searchdialog/csearchdialog.cpp
index b79f8a9..199167a 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( TQT_TQOBJECT(this), TQT_SLOT(searchFinished()));
+	m_searcher.connectFinished( this, TQT_SLOT(searchFinished()));
 
 	initView();
 	initConnections();
diff --git a/bibletime/frontend/searchdialog/csearchresultview.cpp b/bibletime/frontend/searchdialog/csearchresultview.cpp
index 0634e28..3f28758 100644
--- a/bibletime/frontend/searchdialog/csearchresultview.cpp
+++ b/bibletime/frontend/searchdialog/csearchresultview.cpp
@@ -48,25 +48,25 @@ void CSearchResultView::initView() {
 	//setup the popup menu
 	m_popup = new TDEPopupMenu(this);
 
-	m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon, TQT_TQOBJECT(m_popup));
+	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), TQT_TQOBJECT(this), TQT_SLOT(copyItems()), TQT_TQOBJECT(this));
+	m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(copyItems()), this);
 	m_actions.copyMenu->insert(m_actions.copy.result);
-	m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyItemsWithText()), TQT_TQOBJECT(this));
+	m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_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, TQT_TQOBJECT(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), TQT_TQOBJECT(this), TQT_SLOT(saveItems()), TQT_TQOBJECT(this));
+	m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(saveItems()), this);
 	m_actions.saveMenu->insert(m_actions.save.result);
-	m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveItemsWithText()), TQT_TQOBJECT(this));
+	m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_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, TQT_TQOBJECT(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), TQT_TQOBJECT(this), TQT_SLOT(printItems()), TQT_TQOBJECT(this));
+	m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(printItems()), this);
 	m_actions.printMenu->insert(m_actions.print.result);
 	m_actions.printMenu->plug(m_popup);
 }