TQt4 port Bibletime

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/bibletime@1232459 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/bibletime/frontend/displaywindow/cwritewindow.cpp b/bibletime/frontend/displaywindow/cwritewindow.cpp
index 760a767..dcc0557 100644
--- a/bibletime/frontend/displaywindow/cwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/cwritewindow.cpp
@@ -22,8 +22,8 @@
 
 using namespace Profile;
 
-CWriteWindow::CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name )
-: CDisplayWindow(modules, parent,name), m_writeDisplay(0) {}
+CWriteWindow::CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name )
+: CDisplayWindow(modules, tqparent,name), m_writeDisplay(0) {}
 
 CWriteWindow::~CWriteWindow() {}
 
@@ -55,21 +55,21 @@ void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) {
 	settings->setWriteWindowType( writeWindowType() );
 
 	TQRect rect;
-	rect.setX(parentWidget()->x());
-	rect.setY(parentWidget()->y());
+	rect.setX(tqparentWidget()->x());
+	rect.setY(tqparentWidget()->y());
 	rect.setWidth(width());
 	rect.setHeight(height());
 	settings->setGeometry(rect);
 
 	// settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
 	settings->setType(modules().first()->type());
-	settings->setMaximized(isMaximized() || parentWidget()->isMaximized());
+	settings->setMaximized(isMaximized() || tqparentWidget()->isMaximized());
 
 	if (key()) {
 		sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
 		TQString oldLang;
 		if (vk) {
-			oldLang = TQString::fromLatin1(vk->getLocale());
+			oldLang = TQString::tqfromLatin1(vk->getLocale());
 			vk->setLocale("en"); //save english locale names as default!
 		}
 		settings->setKey( key()->key() );
@@ -92,13 +92,13 @@ void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) {
 	setUpdatesEnabled(false);
 
 	if (settings->maximized()) {
-		parentWidget()->showMaximized();
+		tqparentWidget()->showMaximized();
 	}
 	else {
-		const TQRect rect = settings->geometry();
+		const TQRect rect = settings->tqgeometry();
 		resize(rect.width(), rect.height());
-		parentWidget()->move(rect.x(), rect.y());
-		//setGeometry( settings->geometry() );
+		tqparentWidget()->move(rect.x(), rect.y());
+		//setGeometry( settings->tqgeometry() );
 	}
 	// displayWidget()->view()->horizontalScrollBar()->setValue( settings->scrollbarPositions().horizontal );
 	// m_htmlWidget->view()->verticalScrollBar()->setValue( settings->scrollbarPositions().vertical );