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

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

1 files changed, 13 insertions, 13 deletions

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