Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

7 files changed, 57 insertions, 57 deletions

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. */