1 files changed, 27 insertions, 27 deletions

diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
index 1eebba7..1020307 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -106,19 +106,19 @@ CMDIArea* const CDisplayWindow::mdi() const {
 }
 
 /** Returns the right window caption. */
-const QString CDisplayWindow::windowCaption() {
+const TQString CDisplayWindow::windowCaption() {
 	if (!m_modules.count()) {
-		return QString::null;
+		return TQString::null;
 	}
 	
-	return QString(key()->key()).append(" (").append(m_modules.join(" | ")).append(")");
+	return TQString(key()->key()).append(" (").append(m_modules.join(" | ")).append(")");
 }
 
-/** Returns the used modules as a QPtrList */
+/** Returns the used modules as a TQPtrList */
 ListCSwordModuleInfo CDisplayWindow::modules() {
 	ListCSwordModuleInfo mods;
 
-	for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) {
+	for (TQStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) {
 		Q_ASSERT(backend()->findModuleByName(*it));
 		if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) {
 			mods.append(m);
@@ -129,8 +129,8 @@ ListCSwordModuleInfo CDisplayWindow::modules() {
 }
 
 /** Set the window caption. */
-void CDisplayWindow::setCaption( const QString&  ) {
-	QWidget::setCaption( windowCaption() );
+void CDisplayWindow::setCaption( const TQString&  ) {
+	TQWidget::setCaption( windowCaption() );
 	m_mdi->emitWindowCaptionChanged();
 }
 
@@ -161,47 +161,47 @@ void CDisplayWindow::initActions() {
 	new KAction(i18n("Search"),
 				CResMgr::displaywindows::general::search::icon,
 				CResMgr::displaywindows::general::search::accel,
-				this, SLOT(slotSearchInModules()),
+				this, TQT_SLOT(slotSearchInModules()),
 				actionCollection(), CResMgr::displaywindows::general::search::actionName
 			   );
 
 	KStdAction::zoomIn(
-		displayWidget()->connectionsProxy(), SLOT(zoomIn()),
+		displayWidget()->connectionsProxy(), TQT_SLOT(zoomIn()),
 		actionCollection(), "zoomIn"
 	);
 	KStdAction::zoomOut(
-		displayWidget()->connectionsProxy(), SLOT(zoomOut()),
+		displayWidget()->connectionsProxy(), TQT_SLOT(zoomOut()),
 		actionCollection(), "zoomOut"
 	);
 	KStdAction::close(
-		this, SLOT(close()),
+		this, TQT_SLOT(close()),
 		actionCollection(), "closeWindow"
 	);
 
 	KStdAction::selectAll(
-		displayWidget()->connectionsProxy(), SLOT(selectAll()),
+		displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()),
 		actionCollection(), "selectAll"
 	);
 
 	KStdAction::copy(
-		displayWidget()->connectionsProxy(), SLOT(copySelection()),
+		displayWidget()->connectionsProxy(), TQT_SLOT(copySelection()),
 		actionCollection(), "copySelectedText"
 	);
 
 	KStdAction::find(
-		displayWidget()->connectionsProxy(), SLOT(openFindTextDialog()),
+		displayWidget()->connectionsProxy(), TQT_SLOT(openFindTextDialog()),
 		actionCollection(), "findText"
 	);
 
 	new KToolBarPopupAction(
 		i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel,
-		keyChooser(), SLOT( backInHistory() ),
+		keyChooser(), TQT_SLOT( backInHistory() ),
 		actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName
 	);
 
 	new KToolBarPopupAction(
 		i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel,
-		keyChooser(), SLOT( forwardInHistory() ),
+		keyChooser(), TQT_SLOT( forwardInHistory() ),
 		actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName
 	);
 
@@ -218,7 +218,7 @@ void CDisplayWindow::windowActivated( const bool hasFocus ) {
 /** Refresh the settings of this window. */
 void CDisplayWindow::reload() {
 	//first make sure all used Sword modules are still present
-	for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) {
+	for (TQStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) {
 		if (!backend()->findModuleByName(*it)) {
 			it = m_modules.remove(it);
 			if (it == m_modules.end()) {
@@ -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, SIGNAL(sigChanged()), this, SLOT(modulesChanged()));
+		disconnect(m_moduleChooserBar, TQT_SIGNAL(sigChanged()), this, TQT_SLOT(modulesChanged()));
 	}
  	
 	//if a new bar should be set!
 	if (bar) {
 		m_moduleChooserBar = bar;
-		connect(bar, SIGNAL(sigChanged()), SLOT(modulesChanged()));
+		connect(bar, TQT_SIGNAL(sigChanged()), TQT_SLOT(modulesChanged()));
 	}
 }
 
@@ -351,8 +351,8 @@ const bool CDisplayWindow::init() {
 
 	setCaption(windowCaption());
 	//setup focus stuff.
-	setFocusPolicy(QWidget::ClickFocus);
-	parentWidget()->setFocusPolicy(QWidget::ClickFocus);
+	setFocusPolicy(TQWidget::ClickFocus);
+	parentWidget()->setFocusPolicy(TQWidget::ClickFocus);
 
 	initActions();
 	initToolbars();
@@ -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, SIGNAL( sigChanged() ),this, SLOT(lookup() ));
+		disconnect(m_displaySettingsButton, TQT_SIGNAL( sigChanged() ),this, TQT_SLOT(lookup() ));
 
 	m_displaySettingsButton = button;
-	connect(m_displaySettingsButton, SIGNAL(sigChanged()),this, SLOT(lookup()));
+	connect(m_displaySettingsButton, TQT_SIGNAL(sigChanged()),this, TQT_SLOT(lookup()));
 }
 
 /** Lookup the current key. Used to refresh the display. */
@@ -408,7 +408,7 @@ void CDisplayWindow::lookup() {
 	lookup( key() );
 }
 
-void CDisplayWindow::lookup( const QString& moduleName, const QString& keyName ) {
+void CDisplayWindow::lookup( const TQString& moduleName, const TQString& keyName ) {
 	Q_ASSERT(isReady());
 	if (!isReady()) {
 		return;
@@ -435,7 +435,7 @@ void CDisplayWindow::lookup( const QString& moduleName, const QString& keyName )
 	}
 }
 
-void CDisplayWindow::lookup( const QString& keyName ) {
+void CDisplayWindow::lookup( const TQString& keyName ) {
 	/* This function is called for example after a bookmark was dropped on this window
 	*/
 	Q_ASSERT(modules().first());
@@ -453,7 +453,7 @@ KPopupMenu* const CDisplayWindow::popup() {
 	// qWarning("CReadWindow::popup()");
 	if (!m_popupMenu) {
 		m_popupMenu = new KPopupMenu(this);
-		connect(m_popupMenu, SIGNAL(aboutToShow()), this, SLOT(updatePopupMenu()));
+		connect(m_popupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updatePopupMenu()));
 		if (displayWidget()) {
 			displayWidget()->installPopup(m_popupMenu);
 		}
@@ -475,7 +475,7 @@ void CDisplayWindow::setDisplayWidget( CDisplay* newDisplay ) {
 	m_displayWidget = newDisplay;
 }
 
-void CDisplayWindow::closeEvent(QCloseEvent* e) {
+void CDisplayWindow::closeEvent(TQCloseEvent* e) {
 	if (!queryClose()) {
 		e->ignore();
 	}