Rename a number of old tq methods that are no longer tq specific

32 files changed, 222 insertions, 222 deletions

diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 0aa0cd35..8c246ad1 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqguardedptr.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqaccel.h>
 
 //! @internal
@@ -82,8 +82,8 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent )
  , d( new Private() )
 {
 	m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown);
-	tqlayout()->setMargin( KDialog::marginHint() );
-	tqlayout()->setSpacing( KDialog::spacingHint() );
+	layout()->setMargin( KDialog::marginHint() );
+	layout()->setSpacing( KDialog::spacingHint() );
 	KAction *a = KStdAction::findNext(0, 0, 0);
 	m_btnFind->setText(a->text());
 	m_btnFind->setIconSet(a->iconSet());
@@ -175,7 +175,7 @@ void KexiFindDialog::setCurrentLookInColumnName(const TQString& columnName)
 		index = d->lookInColumnNames.findIndex( columnName );
 		if (index == -1) {
 			kdWarning() << TQString("KexiFindDialog::setCurrentLookInColumn(%1) column name not found on the list")
-				.tqarg(columnName) << endl;
+				.arg(columnName) << endl;
 			return;
 		}
 		index = index + 1/*"(All fields)"*/ + 1/*"(Current field)"*/;
@@ -214,13 +214,13 @@ void KexiFindDialog::setObjectNameForCaption(const TQString& name)
 		if (name.isEmpty())
 			setCaption(i18n("Replace"));
 		else
-			setCaption(i18n("Replace in \"%1\"").tqarg(name));
+			setCaption(i18n("Replace in \"%1\"").arg(name));
 	}
 	else {
 		if (name.isEmpty())
 			setCaption(i18n("Find"));
 		else
-			setCaption(i18n("Find in \"%1\"").tqarg(name));
+			setCaption(i18n("Find in \"%1\"").arg(name));
 	}
 }
 
diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui
index 8ffc254d..133570e7 100644
--- a/kexi/main/kexifinddialogbase.ui
+++ b/kexi/main/kexifinddialogbase.ui
@@ -150,7 +150,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -243,7 +243,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>2</height>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 5594d577..3071dd38 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -111,7 +111,7 @@
 # define KexiVDebug if (0) kdDebug()
 #endif
 
-//first fix the tqgeometry
+//first fix the geometry
 //#define KEXI_NO_CTXT_HELP 1
 
 #ifndef KEXI_NO_CTXT_HELP
@@ -127,7 +127,7 @@
 //! width changes will be removed in KMDI
 //#define PROPEDITOR_VISIBILITY_CHANGES
 
-//temporary fix to manage tqlayout
+//temporary fix to manage layout
 #include "ksplitter.h"
 #define KDOCKWIDGET_P 1
 
@@ -245,8 +245,8 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		int scnum = TQApplication::desktop()->screenNumber(parentWidget());
 		TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 		d->config->setGroup("MainWindow");
-		TQSize s ( d->config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ),
-			d->config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) );
+		TQSize s ( d->config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 700 ),
+			d->config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) );
 		resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height()));
 	}
 
@@ -360,7 +360,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		TQToolButton *closeButton = new TQToolButton( tabWidget() );
 		closeButton->setAutoRaise( true );
 		closeButton->setPixmap( TQPixmap( kde2_closebutton ) );
-		closeButton->setPaletteBackgroundColor(closeButton->tqpalette().active().background()); 
+		closeButton->setPaletteBackgroundColor(closeButton->palette().active().background()); 
 //		closeButton->setIconSet(SmallIconSet("tab_remove"));
 		tabWidget()->setCornerWidget( closeButton, TQt::TopRight );
 		closeButton->hide(); // hide until it's needed to avoid problems in "user mode" 
@@ -465,7 +465,7 @@ void KexiMainWindowImpl::switchToIDEAlMode(bool showMessage)
 		else {
 			KMessageBox::information(this,
 				i18n("User interface mode will be switched to IDEAl at next %1 application startup.")
-				.tqarg(KEXI_APP_NAME));
+				.arg(KEXI_APP_NAME));
 			//delayed
 			d->mdiModeToSwitchAfterRestart = KMdi::IDEAlMode;
 		}
@@ -492,7 +492,7 @@ void KexiMainWindowImpl::switchToChildframeMode(bool showMessage)
 		else {
 			KMessageBox::information(this,
 				i18n("User interface mode will be switched to Childframe at next %1 application startup.")
-				.tqarg(KEXI_APP_NAME));
+				.arg(KEXI_APP_NAME));
 			//delayed
 			d->mdiModeToSwitchAfterRestart = KMdi::ChildframeMode;
 		}
@@ -1281,7 +1281,7 @@ static TQString internalReason(KexiDB::Object *obj)
 	const TQString &s = obj->errorMsg();
 	if (s.isEmpty())
 		return s;
-	return TQString("<br>(%1) ").tqarg(i18n("reason:")+" <i>"+s+"</i>");
+	return TQString("<br>(%1) ").arg(i18n("reason:")+" <i>"+s+"</i>");
 }
 
 tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
@@ -1319,7 +1319,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
 		if (incompatibleWithKexi) {
 			if (KMessageBox::Yes == KMessageBox::questionYesNo(this,
 				i18n("<qt>Database project %1 does not appear to have been created using Kexi.<br><br>"
-				"Do you want to import it as a new Kexi project?</qt>").tqarg(projectData.infoString()),
+				"Do you want to import it as a new Kexi project?</qt>").arg(projectData.infoString()),
 				0, KGuiItem(i18n("Import Database", "&Import..."), "database_import"),
 				KStdGuiItem::quit()))
 			{
@@ -1447,9 +1447,9 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 					not_found_msg += (TQString("\"") + info["name"] + "\" - ");
 				if (info["action"]=="new")
 					not_found_msg += i18n("cannot create object - unknown object type \"%1\"")
-						.tqarg(info["type"]);
+						.arg(info["type"]);
 				else
-					not_found_msg += i18n("unknown object type \"%1\"").tqarg(info["type"]);
+					not_found_msg += i18n("unknown object type \"%1\"").arg(info["type"]);
 				not_found_msg += internalReason(&Kexi::partManager())+"<br></li>";
 				continue;
 			}
@@ -1457,7 +1457,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 			if (info["action"]=="new") {
 				if (!newObject( i, openingCancelled) && !openingCancelled) {
 					not_found_msg += "<li>";
-					not_found_msg += (i18n("cannot create object of type \"%1\"").tqarg(info["type"])+
+					not_found_msg += (i18n("cannot create object of type \"%1\"").arg(info["type"])+
 						internalReason(d->prj)+"<br></li>");
 				}
 				else
@@ -1551,7 +1551,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 	if (!not_found_msg.isEmpty())
 		showErrorMessage(i18n("You have requested selected objects to be automatically opened "
 			"or processed on startup. Several objects cannot be opened or processed."),
-			TQString("<ul>%1</ul>").tqarg(not_found_msg) );
+			TQString("<ul>%1</ul>").arg(not_found_msg) );
 
 	d->updatePropEditorVisibility(d->curDialog ? d->curDialog->currentViewMode() : 0);
 #if defined(KDOCKWIDGET_P)
@@ -1788,7 +1788,7 @@ void KexiMainWindowImpl::slotLastActions()
 	}
 #endif
 #ifdef TQ_WS_WIN
-	showMaximized();//js: workaround for not yet completed tqlayout settings storage on win32
+	showMaximized();//js: workaround for not yet completed layout settings storage on win32
 #endif
 }
 
@@ -1836,7 +1836,7 @@ void KexiMainWindowImpl::initPropertyEditor()
 
 	//1		dw->setMinimumWidth(200);
 
-	//	ds->setSeparatorPos(d->propEditor->tqsizeHint().width(), true);
+	//	ds->setSeparatorPos(d->propEditor->sizeHint().width(), true);
 
 			//heh, this is for IDEAl only, I suppose?
 	//js		if (m_rightContainer) {
@@ -1864,7 +1864,7 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p)
 }
 
 //! internal
-void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized)
+void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool childrenMaximized)
 {
 	//js todo: allow to set custom "static" app caption
 
@@ -1877,18 +1877,18 @@ void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized)
 		//current dialog isn't attached! - find top level child
 		if (m_pMdi->topChild()) {
 			view = m_pMdi->topChild()->m_pClient;
-			tqchildrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized;
+			childrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized;
 		}
 		else
 			view = 0;
 	}
 
-	if (tqchildrenMaximized && view) {
+	if (childrenMaximized && view) {
 		setCaption( d->curDialog->caption()
-			+ (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::tqfromLatin1(" - ") + d->appCaptionPrefix)) );
+			+ (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::fromLatin1(" - ") + d->appCaptionPrefix)) );
 	}
 	else {
-		setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::tqfromLatin1(" - ")))
+		setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::fromLatin1(" - ")))
 			+ d->origAppCaption );
 	}
 }
@@ -2093,8 +2093,8 @@ KexiMainWindowImpl::restoreSettings()
 		}*/
 
 		config->setGroup("MainWindow");
-	    TQSize s ( config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ),
-              config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) );
+	    TQSize s ( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 700 ),
+              config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) );
 		resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height()));
 	}
 #endif
@@ -3006,10 +3006,10 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode)
 	}
 	if (!d->curDialog->supportsViewMode( viewMode )) {
 		showErrorMessage(i18n("Selected view is not supported for \"%1\" object.")
-			.tqarg(d->curDialog->partItem()->name()),
+			.arg(d->curDialog->partItem()->name()),
 		i18n("Selected view (%1) is not supported by this object type (%2).")
-			.tqarg(Kexi::nameForViewMode(viewMode))
-			.tqarg(d->curDialog->part()->instanceCaption()) );
+			.arg(Kexi::nameForViewMode(viewMode))
+			.arg(d->curDialog->part()->instanceCaption()) );
 		d->toggleLastCheckedMode();
 		return false;
 	}
@@ -3019,7 +3019,7 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode)
 	tristate res = d->curDialog->switchToViewMode( viewMode );
 	if (!res) {
 		updateCustomPropertyPanelTabs(0, Kexi::NoViewMode); //revert
-		showErrorMessage(i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(viewMode)),
+		showErrorMessage(i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(viewMode)),
 			d->curDialog);
 		d->toggleLastCheckedMode();
 		return false;
@@ -3118,7 +3118,7 @@ tristate KexiMainWindowImpl::getNewObjectInfo(
 			if (allowOverwriting) {
 				int res = KMessageBox::warningYesNoCancel(this,
 					"<p>"+part->i18nMessage("Object \"%1\" already exists.", 0)
-						.tqarg(d->nameDialog->widget()->nameText())
+						.arg(d->nameDialog->widget()->nameText())
 					+"</p><p>"+i18n("Do you want to replace it?")+"</p>", 0,
 					KGuiItem(i18n("&Replace"), "button_yes"),
 					KGuiItem(i18n("&Choose Other Name...")),
@@ -3135,11 +3135,11 @@ tristate KexiMainWindowImpl::getNewObjectInfo(
 			else {
 				KMessageBox::information(this,
 					"<p>"+part->i18nMessage("Object \"%1\" already exists.", 0)
-						.tqarg(d->nameDialog->widget()->nameText())
+						.arg(d->nameDialog->widget()->nameText())
 					+"</p><p>"+i18n("Please choose other name.")+"</p>");
 //				" For example: Table \"my_table\" already exists" ,
 //				"%1 \"%2\" already exists.\nPlease choose other name.")
-//				.tqarg(dlg->part()->instanceName()).tqarg(d->nameDialog->widget()->nameText()));
+//				.arg(dlg->part()->instanceName()).arg(d->nameDialog->widget()->nameText()));
 				continue;
 			}
 		}
@@ -3160,7 +3160,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me
 		//data was saved in the past -just save again
 		res = dlg->storeData(dontAsk);
 		if (!res)
-			showErrorMessage(i18n("Saving \"%1\" object failed.").tqarg(dlg->partItem()->name()),
+			showErrorMessage(i18n("Saving \"%1\" object failed.").arg(dlg->partItem()->name()),
 				d->curDialog);
 		return res;
 	}
@@ -3177,7 +3177,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me
 	if (~res)
 		return cancelled;
 	if (!res) {
-		showErrorMessage(i18n("Saving new \"%1\" object failed.").tqarg(dlg->partItem()->name()),
+		showErrorMessage(i18n("Saving new \"%1\" object failed.").arg(dlg->partItem()->name()),
 			d->curDialog);
 		return false;
 	}
@@ -3224,11 +3224,11 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar
 		saveChanges.setToolTip(i18n("Save changes"));
 		saveChanges.setWhatsThis(
 			i18n( "Pressing this button will save all recent changes made in \"%1\" object." )
-			.tqarg(dlg->partItem()->name()) );
+			.arg(dlg->partItem()->name()) );
 		KGuiItem discardChanges( KStdGuiItem::discard() );
 		discardChanges.setWhatsThis(
 			i18n( "Pressing this button will discard all recent changes made in \"%1\" object." )
-			.tqarg(dlg->partItem()->name()) );
+			.arg(dlg->partItem()->name()) );
 
 		//dialog's data is dirty:
 		//--adidional message, e.g. table designer will return 
@@ -3243,7 +3243,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar
 
 		const int questionRes = KMessageBox::warningYesNoCancel( this,
 			"<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg)
-			.tqarg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>"
+			.arg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>"
 			+ additionalMessage /*may be empty*/,
 			TQString(),
 			saveChanges,
@@ -3380,9 +3380,9 @@ void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool
 	KMdiMainFrm::attachWindow(pWnd,true,bAutomaticResize);
 	//for dialogs in normal state: decrease dialog's height if it exceeds area contents
 	if (pWnd->mdiParent()->state() == KMdiChildFrm::Normal
-		&& pWnd->tqgeometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom())
+		&& pWnd->geometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom())
 	{
-		TQRect r = pWnd->tqgeometry();
+		TQRect r = pWnd->geometry();
 		r.setBottom( pWnd->mdiParent()->mdiAreaContentsRect().bottom() - 5 );
 		pWnd->setGeometry( r );
 	}
@@ -3444,7 +3444,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		/* Fixes for popup menus behaviour:
 		 For hiding/showing: focus previously (d->focus_before_popup)
 		 focused window, if known, otherwise focus currently focused one.
-		 And: just tqinvalidate actions.
+		 And: just invalidate actions.
 		*/
 		if (e->type()==TQEvent::Hide || e->type()==TQEvent::Show) {
 			KexiVDebug << e->type() << endl;
@@ -3479,10 +3479,10 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		KexiVDebug << (focus_w ? focus_w->name() : "" )  << endl;
 		KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl;
 #ifdef KEXI_STATUSBAR_DEBUG
-		TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0;
-		d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
-			.tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "")
-			.tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "")
+		TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0;
+		d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
+			.arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "")
+			.arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "")
 			);
 #endif
 	}
@@ -3492,10 +3492,10 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		KexiVDebug << (focus_w ? focus_w->name() : "" )  << endl;
 		KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl;
 #ifdef KEXI_STATUSBAR_DEBUG
-		TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0;
-		d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
-			.tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "")
-			.tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "")
+		TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0;
+		d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
+			.arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "")
+			.arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "")
 			);
 #endif
 	}
@@ -3512,7 +3512,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 //				invalidateSharedActions();
 			}
 			else {
-/*			TQObject* o = tqfocusWidget();
+/*			TQObject* o = focusWidget();
 			while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase"))
 				o = o->parent();*/
 //js				invalidateSharedActions(focus_w);
@@ -3534,7 +3534,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		return true;
 	}
 
-	//remember currently focued window tqinvalidate act.
+	//remember currently focued window invalidate act.
 	if (e->type()==TQEvent::FocusOut) {
 		if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
 			if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) {
@@ -3605,7 +3605,7 @@ KexiMainWindowImpl::openObject(KexiPart::Item* item, int viewMode, bool &opening
 	if (!openingAllowed(item, viewMode)) {
 		if (errorMessage)
 			*errorMessage = i18n("opening is not allowed in \"data view/design view/text view\" mode", 
-				"opening is not allowed in \"%1\" mode").tqarg(Kexi::nameForViewMode(viewMode));
+				"opening is not allowed in \"%1\" mode").arg(Kexi::nameForViewMode(viewMode));
 		openingCancelled = true;
 		return 0;
 	}
@@ -3790,7 +3790,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk )
 			"<p>"+i18n("Do you want to permanently delete:\n"
 			"%1\n"
 			"If you click \"Delete\", you will not be able to undo the deletion.")
-				.tqarg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ),
+				.arg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ),
 			0, KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::no()))
 			return cancelled;
 	}
@@ -3865,7 +3865,7 @@ void KexiMainWindowImpl::renameObject( KexiPart::Item *item, const TQString& _ne
 	const bool res = d->prj->renameObject(this, *item, newName);
 	enableMessages(true);
 	if (!res) {
-		showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").tqarg(newName) );
+		showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").arg(newName) );
 		success = false;
 		return;
 	}
@@ -3980,7 +3980,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/)
 	if (onStartup && !d->showImportantInfoOnStartup)
 		return;
 
-	TQString key = TQString("showImportantInfo %1").tqarg(KEXI_VERSION_STRING);
+	TQString key = TQString("showImportantInfo %1").arg(KEXI_VERSION_STRING);
 	d->config->setGroup("Startup");
 	bool show = d->config->readBoolEntry(key,true);
 
@@ -4005,7 +4005,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/)
 			ts.setCodec( KGlobal::locale()->codecForEncoding() );
 			TQTextBrowser *tb = KexiUtils::findFirstChild<KTextBrowser>(&tipDialog,"KTextBrowser");
 			if (tb) {
-				tb->setText( TQString("<qt>%1</qt>").tqarg(ts.read()) );
+				tb->setText( TQString("<qt>%1</qt>").arg(ts.read()) );
 			}
 			f.close();
 		}
@@ -4062,7 +4062,7 @@ KexiMainWindowImpl::initUserMode(KexiProjectData *projectData)
 #if 0 //todo reenable; autoopen objects are handled elsewhere
 	KexiDB::TableSchema *sch = d->prj->dbConnection()->tableSchema("kexi__final");
 	TQString err_msg = i18n("Could not start project \"%1\" in Final Mode.")
-		.tqarg(static_cast<KexiDB::SchemaData*>(projectData)->name());
+		.arg(static_cast<KexiDB::SchemaData*>(projectData)->name());
 	if(!sch)
 	{
 		hide();
@@ -4184,7 +4184,7 @@ void KexiMainWindowImpl::slotToolsCompactDatabase()
 		if (!drv || !(drv->features() & KexiDB::Driver::CompactingDatabaseSupported)) {
 			KMessageBox::information(this, "<qt>"+
 				i18n("Compacting database file <nobr>\"%1\"</nobr> is not supported.")
-				.tqarg(TQDir::convertSeparators(cdata.fileName())));
+				.arg(TQDir::convertSeparators(cdata.fileName())));
 			return;
 		}
 		data = new KexiProjectData( cdata, cdata.fileName() );
@@ -4409,7 +4409,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 
 	if (dlg) {
 		// accept row changes
-		TQWidget *prevFocusWidget = tqfocusWidget();
+		TQWidget *prevFocusWidget = focusWidget();
 		dlg->setFocus();
 		d->action_data_save_row->activate();
 		if (prevFocusWidget)
@@ -4423,11 +4423,11 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 			saveChanges.setToolTip(i18n("Save changes"));
 			saveChanges.setWhatsThis(
 				i18n( "Pressing this button will save all recent changes made in \"%1\" object." )
-				.tqarg(item->name()) );
+				.arg(item->name()) );
 			KGuiItem doNotSave( KStdGuiItem::no() );
 			doNotSave.setWhatsThis(
 				i18n( "Pressing this button will ignore all unsaved changes made in \"%1\" object." )
-				.tqarg(dlg->partItem()->name()) );
+				.arg(dlg->partItem()->name()) );
 
 			TQString question;
 			if (action == PrintItem)
@@ -4441,7 +4441,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 
 			const int questionRes = KMessageBox::warningYesNoCancel( this,
 				"<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg)
-				.tqarg(item->name()) + "</p><p>" + question + "</p>",
+				.arg(item->name()) + "</p><p>" + question + "</p>",
 				TQString(), 
 				saveChanges,
 				doNotSave);
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 9dbedae3..141cd475 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -296,7 +296,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		virtual bool acceptsSharedActions(TQObject *w);
 
 		/*! Performs lookup like in KexiSharedActionHost::focusWindow()
-		 but starting from \a w instead of a widget returned by TQWidget::tqfocusWidget().
+		 but starting from \a w instead of a widget returned by TQWidget::focusWidget().
 		 \return NULL if no widget matches acceptsSharedActions() or if \a w is NULL. */
 		TQWidget* findWindow(TQWidget *w);
 
@@ -346,7 +346,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		void slotPartLoaded(KexiPart::Part* p);
 
-		void slotCaptionForCurrentMDIChild(bool tqchildrenMaximized);
+		void slotCaptionForCurrentMDIChild(bool childrenMaximized);
 		void slotNoMaximizedChildFrmLeft(KMdiChildFrm*);
 		void slotLastChildViewClosed();
 		void slotChildViewIsDetachedNow(TQWidget*);
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index c79b58db..3eeccc94 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -219,8 +219,8 @@ void updatePropEditorDockWidthInfo() {
 
 	void showStartProcessMsg(const TQStringList& args)
 	{
-		wnd->showErrorMessage(i18n("Could not start %1 application.").tqarg(KEXI_APP_NAME),
-			i18n("Command \"%1\" failed.").tqarg(args.join(" ")));
+		wnd->showErrorMessage(i18n("Could not start %1 application.").arg(KEXI_APP_NAME),
+			i18n("Command \"%1\" failed.").arg(args.join(" ")));
 	}
 
 	void hideMenuItem(const TQString& menuName, const TQString& itemText, bool alsoSeparator)
@@ -267,7 +267,7 @@ void updatePropEditorDockWidthInfo() {
 #endif
 			} else {
 				//propEditorToolWindow->show();
-				TQWidget *origFocusWidget = tqApp->tqfocusWidget();
+				TQWidget *origFocusWidget = tqApp->focusWidget();
 				wnd->makeWidgetDockVisible(propEditorTabWidget);
 				if (origFocusWidget)
 					origFocusWidget->setFocus();
diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp
index 45cbc449..f3e1acec 100644
--- a/kexi/main/kexinamedialog.cpp
+++ b/kexi/main/kexinamedialog.cpp
@@ -53,12 +53,12 @@ void KexiNameDialog::init()
 {
 	TQGridLayout *lyr = new TQGridLayout(plainPage(), 2, 3);
 	m_icon = new TQLabel( plainPage(), "icon" );
-	m_icon->tqsetAlignment( int( AlignTop | AlignLeft ) );
-	m_icon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0));
+	m_icon->setAlignment( int( AlignTop | AlignLeft ) );
+	m_icon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0));
 	m_icon->setFixedWidth(50);
 	lyr->addWidget(m_icon,0,0);
 
-	m_widget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0));
+	m_widget->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0));
 	lyr->addWidget(m_widget,0,1);
 	lyr->addItem(new TQSpacerItem( 25, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 0, 2);
 	lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1);
@@ -75,7 +75,7 @@ void KexiNameDialog::updateSize()
 {
 //	resize( TQSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) )
 	resize( TQSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) )
-		.expandedTo(tqminimumSizeHint()) );
+		.expandedTo(minimumSizeHint()) );
 //	updateGeometry();
 }
 
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index c6ca8f41..08210ac5 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -20,7 +20,7 @@
 #include "kexinamewidget.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klineedit.h>
 #include <kmessagebox.h>
@@ -66,8 +66,8 @@ void KexiNameWidget::init(
 
 	lbl_message = new TQLabel( this, "message" );
 	setMessageText( message );
-	lbl_message->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
-	lbl_message->tqsetAlignment( TQLabel::AlignTop | TQLabel::WordBreak );
+	lbl_message->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+	lbl_message->setAlignment( TQLabel::AlignTop | TQLabel::WordBreak );
 	lyr->addMultiCellWidget( lbl_message, 0, 0, 0, 1 );
 
 	lbl_caption = new TQLabel( captionLabel.isEmpty() ? i18n( "Caption:" ) : captionLabel,
@@ -79,17 +79,17 @@ void KexiNameWidget::init(
 	lyr->addWidget( lbl_name, 2, 0 );
 
 	le_caption = new KLineEdit( nameText, this, "le_caption" );
-	le_caption->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0));
+	le_caption->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0));
 	lyr->addWidget( le_caption, 1, 1 );
 
 	le_name = new KLineEdit( nameText, this, "le_name" );
-	le_name->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0));
+	le_name->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0));
 	Validator *idValidator = new IdentifierValidator(0, "id_val");
 	le_name->setValidator( m_validator = new MultiValidator(idValidator, TQT_TQOBJECT(this), "val") );
 	lyr->addWidget( le_name, 2, 1 );
 
 	setFocusProxy(le_caption);
-	resize( TQSize(342, 123).expandedTo(tqminimumSizeHint()) );
+	resize( TQSize(342, 123).expandedTo(minimumSizeHint()) );
 
 	m_nameWarning = i18n("Please enter the name.");
 	m_captionWarning = i18n("Please enter the caption.");
diff --git a/kexi/main/kexinamewidget.h b/kexi/main/kexinamewidget.h
index acbeed5c..1ab0ea89 100644
--- a/kexi/main/kexinamewidget.h
+++ b/kexi/main/kexinamewidget.h
@@ -21,7 +21,7 @@
 #define KEXINAMEWIDGET_H
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klineedit.h>
 
 namespace KexiUtils {
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 9beffbf5..1218df23 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -55,7 +55,7 @@ KexiNewStuff::install(const TQString &fileName)
 
 	KTar archive( fileName );
 	if ( !archive.open( IO_ReadOnly ) ) {
-		kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").tqarg(fileName) << endl;
+		kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").arg(fileName) << endl;
 		return false;
 	}
 	const KArchiveDirectory *archiveDir = archive.directory();
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index e4bfd580..ab6fffab 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -22,7 +22,7 @@
 
 #include "kexistatusbar.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpainter.h>
 #include <tqtimer.h>
@@ -78,7 +78,7 @@ void KexiStatusBar::activePartChanged(KParts::Part *part)
 	if (part && part->widget()) {
 		if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) {
 			connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
-				this, TQT_SLOT( settqStatus( const TQString & ) ) );
+				this, TQT_SLOT( setStatus( const TQString & ) ) );
 
 #  if TDE_VERSION < KDE_MAKE_VERSION(3,1,90)
 			changeItem(m_map[ m_activePart ], m_msgID);
@@ -110,7 +110,7 @@ void KexiStatusBar::cursorPositionChanged()
 #endif
 }
 
-void KexiStatusBar::settqStatus(const TQString &str)
+void KexiStatusBar::setStatus(const TQString &str)
 {
 	kdDebug() << "KexiStatusBar::setStatus(" << str << ")" << endl;
 //	m_status->setText(str);
@@ -125,16 +125,16 @@ void KexiStatusBar::settqStatus(const TQString &str)
 
 void KexiStatusBar::setCursorPosition(int line, int col)
 {
-//	m_status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col));
-	changeItem(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col), m_msgID);
+//	m_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col));
+	changeItem(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col), m_msgID);
 }
 
 /*void KexiStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
-	if(widget->tqsizeHint().height() + 4 > height())
-		setFixedHeight(widget->tqsizeHint().height() + 4);
+	if(widget->sizeHint().height() + 4 > height())
+		setFixedHeight(widget->sizeHint().height() + 4);
 }*/
 
 void KexiStatusBar::setReadOnlyFlag(bool readOnly)
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index bab1277a..e8c31d41 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -48,7 +48,7 @@ class KexiStatusBar : public KStatusBar
 //		virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false);
 
 	public slots:
-		virtual void settqStatus(const TQString &str);
+		virtual void setStatus(const TQString &str);
 		virtual void setReadOnlyFlag(bool readOnly);
 
 	protected slots:
@@ -58,7 +58,7 @@ class KexiStatusBar : public KStatusBar
 
 	protected:
 		int m_msgID, m_readOnlyID;
-//		TQLabel *m_status, *m_readOnlytqStatus;
+//		TQLabel *m_status, *m_readOnlyStatus;
 
 #if KexiStatusBar_KTEXTEDITOR_USED
 	KTextEditor::ViewCursorInterface * m_cursorIface;
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 45ab5892..8591167f 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -278,7 +278,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		}
 		painter.setFont(m_mainFont);
 
-		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(),
+		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(),
 			true, false);
 		m_dateTimeWidth = painter.fontMetrics().width(m_dateTimeText+"   ");
 		m_mainLineSpacing = painter.fontMetrics().lineSpacing();
@@ -326,9 +326,9 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		TQString pageNumString;
 		if (m_pagesCount>0)
 			pageNumString = i18n("Page (number) of (total)", "Page %1 of %2")
-				.tqarg(pageNumber+1).tqarg(m_pagesCount);
+				.arg(pageNumber+1).arg(m_pagesCount);
 		else
-			pageNumString = i18n("Page %1").tqarg(pageNumber+1);
+			pageNumString = i18n("Page %1").arg(pageNumber+1);
 		painter.drawText((int)m_leftMargin, 
 			(int)m_topMargin + m_pageHeight - m_mainLineSpacing, 
 			m_pageWidth, m_mainLineSpacing,
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 476f924a..1df66250 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -38,7 +38,7 @@
 
 #include <tqlabel.h>
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -356,7 +356,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 			m_contents->openDataLink->setText( i18n("Open This Query") );
 			m_origCaptionLabelText = i18n("<h2>Page setup for printing \"%1\" query data</h2>");
 		}
-		m_contents->captionLabel->setText( m_origCaptionLabelText.tqarg(m_item->name()) );
+		m_contents->captionLabel->setText( m_origCaptionLabelText.arg(m_item->name()) );
 	}
 	connect(m_contents->headerTitleLineEdit,TQT_SIGNAL(textChanged(const TQString&)), 
 		this, TQT_SLOT(slotTitleTextChanged(const TQString&)));
@@ -442,8 +442,8 @@ void KexiSimplePrintingPageSetup::updatePageLayoutAndUnitInfo()
 	TQString s;
 	if (m_settings.pageLayout.format == PG_CUSTOM) {
 		s += TQString(" (%1 %2 x %3 %4)")
-			.tqarg(m_settings.pageLayout.ptWidth).tqarg(KoUnit::unitName(m_unit))
-			.tqarg(m_settings.pageLayout.ptHeight).tqarg(KoUnit::unitName(m_unit));
+			.arg(m_settings.pageLayout.ptWidth).arg(KoUnit::unitName(m_unit))
+			.arg(m_settings.pageLayout.ptHeight).arg(KoUnit::unitName(m_unit));
 	}
 	else
 		s += KoPageFormat::name(m_settings.pageLayout.format);
diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
index 6b169f7e..ff46ee7a 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
+++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout15</cstring>
+                <cstring>layout15</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
@@ -106,7 +106,7 @@
             <property name="text">
                 <string>Page title:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignBottom</set>
             </property>
             <property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout19</cstring>
+                <cstring>layout19</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>230</width>
                             <height>20</height>
@@ -222,7 +222,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="12" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -238,7 +238,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>6</height>
@@ -343,7 +343,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -360,7 +360,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -377,7 +377,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -394,7 +394,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -411,7 +411,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 68c1c673..d17aac45 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -22,7 +22,7 @@
 #include "kexisimpleprintpreviewwindow_p.h"
 #include <kexi_version.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqaccel.h>
 #include <tqtimer.h>
 #include <tqlabel.h>
@@ -52,7 +52,7 @@ void KexiSimplePrintPreviewView::paintEvent( TQPaintEvent *pe )
 		return;
 	TQPixmap pm(size()); //dbl buffered
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+	p.begin(TQT_TQPAINTDEVICE(&pm), this);
 //! @todo only for screen!
 	p.fillRect(TQRect(TQPoint(0,0),pm.size()), TQBrush(white));//pe->rect(), TQBrush(white));
 	if (m_window->currentPage()>=0)
@@ -135,7 +135,7 @@ void KexiSimplePrintPreviewScrollView::setFullWidth()
 	viewport()->setUpdatesEnabled(true);
 	resize(size()+TQSize(1,1)); //to update pos.
 	widget->enablePainting = true;
-	widget->tqrepaint();
+	widget->repaint();
 }
 
 void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y)
@@ -157,7 +157,7 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
  , m_pageNumber(-1)
  , m_pagesCount(-1)
 {
-	setCaption(i18n("%1 - Print Preview - %2").tqarg(previewName).tqarg(KEXI_APP_NAME));
+	setCaption(i18n("%1 - Print Preview - %2").arg(previewName).arg(KEXI_APP_NAME));
 	setIcon(DesktopIcon("filequickprint"));
 	TQVBoxLayout *lyr = new TQVBoxLayout(this, 6);
 
@@ -196,11 +196,11 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	m_scrollView = new KexiSimplePrintPreviewScrollView(this);
 	m_scrollView->setUpdatesEnabled(false);
 	m_view = m_scrollView->widget;
-	m_scrollView->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	m_scrollView->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	lyr->addWidget(m_scrollView);
 
 	TQWidget* navToolbarWidget = new TQWidget(this); //widget used to center the navigator toolbar
-	navToolbarWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	navToolbarWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget);
 	lyr->addWidget(navToolbarWidget);
 
@@ -308,14 +308,14 @@ void KexiSimplePrintPreviewWindow::goToPage(int pageNumber)
 	m_pageNumber = pageNumber;
 	m_pagesCount = m_engine.pagesCount();
 
-	m_view->tqrepaint(); //this will automatically paint a new page
+	m_view->repaint(); //this will automatically paint a new page
 
 	m_navToolbar->setItemEnabled(m_idNext, pageNumber < ((int)m_engine.pagesCount()-1));
 	m_navToolbar->setItemEnabled(m_idLast, pageNumber < ((int)m_engine.pagesCount()-1));
 	m_navToolbar->setItemEnabled(m_idPrevious, pageNumber > 0);
 	m_navToolbar->setItemEnabled(m_idFirst, pageNumber > 0);
 	static_cast<TQLabel*>(m_navToolbar->getWidget(m_idPageNumberLabel))->setText(
-		i18n("Page (number) of (total)", "Page %1 of %2").tqarg(m_pageNumber+1).tqarg(m_engine.pagesCount()));
+		i18n("Page (number) of (total)", "Page %1 of %2").arg(m_pageNumber+1).arg(m_engine.pagesCount()));
 }
 
 void KexiSimplePrintPreviewWindow::setFullWidth()
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index a9a2a316..c2c84011 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -42,10 +42,10 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqtooltip.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqgroupbox.h>
 #include <tqwidgetstack.h>
 #include <tqbuttongroup.h>
@@ -149,8 +149,8 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
 	TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection"));
 	TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections"));
 	d->stack->addWidget(m_remote);
-	if (m_remote->tqlayout())
-		m_remote->tqlayout()->setMargin(0);
+	if (m_remote->layout())
+		m_remote->layout()->setMargin(0);
 //	connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn()));
 	connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),
 		this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*)));
@@ -197,8 +197,8 @@ void KexiConnSelectorWidget::slotPrjTypeSelected(int id)
 			if (m_remote->list->firstChild()) {
 				m_remote->list->setSelected(m_remote->list->firstChild(),true);
 			}
-			m_remote->descriptionEdit->setPaletteBackgroundColor(tqpalette().active().background());
-			m_remote->descGroupBox->tqlayout()->setMargin(2);
+			m_remote->descriptionEdit->setPaletteBackgroundColor(palette().active().background());
+			m_remote->descGroupBox->layout()->setMargin(2);
 			m_remote->list->setFocus();
 			slotConnectionSelectionChanged();
 		}
@@ -222,7 +222,7 @@ void KexiConnSelectorWidget::showSimpleConn()
 		m_fileDlg = new KexiStartupFileDialog( d->startDirOrVariable, KexiStartupFileDialog::Opening,
 			d->stack, "openExistingFileDlg");
 		m_fileDlg->setConfirmOverwrites( d->confirmOverwrites );
-//		static_cast<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg );
+//		static_cast<TQVBoxLayout*>(m_file->layout())->insertWidget( 2, m_fileDlg );
 		d->stack->addWidget(m_fileDlg);
 
 		for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) {
@@ -350,9 +350,9 @@ bool KexiConnSelectorWidget::confirmOverwrites() const
 
 /*static TQString msgUnfinished() { 
 	return i18n("To define or change a connection, use command line options or click on .kexis file. "
-		"You can find example .kexis file at <a href=\"%1\">here</a>.").tqarg("") //temporary, please do not change for 0.8!
+		"You can find example .kexis file at <a href=\"%1\">here</a>.").arg("") //temporary, please do not change for 0.8!
 		+ "\nhttp://www.kexi-project.org/resources/testdb.kexis"; */
-//		.tqarg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis");
+//		.arg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis");
 //}
 
 void KexiConnSelectorWidget::slotRemoteAddBtnClicked()
@@ -407,7 +407,7 @@ void KexiConnSelectorWidget::slotRemoteRemoveBtnClicked()
 		return;
 	if (KMessageBox::Continue!=KMessageBox::warningContinueCancel(0, 
 		i18n("Do you want to remove database connection \"%1\" from the list of available connections?")
-		.tqarg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), 
+		.arg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), 
 		KMessageBox::Notify|KMessageBox::Dangerous))
 		return;
 
diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui
index 5c7bb64d..c55614e2 100644
--- a/kexi/main/startup/KexiConnSelectorBase.ui
+++ b/kexi/main/startup/KexiConnSelectorBase.ui
@@ -72,7 +72,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>60</height>
@@ -149,7 +149,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -166,7 +166,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -177,7 +177,7 @@
             <property name="name">
                 <cstring>descGroupBox</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>80</height>
@@ -205,7 +205,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>50</height>
@@ -246,7 +246,7 @@
 &lt;p&gt;You will see existing Kexi projects available for the selected connection. Here you may also add, edit or remove connections from the list.
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
@@ -268,7 +268,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop</set>
             </property>
         </widget>
diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h
index 4ac59bc0..0ee1e4dd 100644
--- a/kexi/main/startup/KexiDBTitlePage.h
+++ b/kexi/main/startup/KexiDBTitlePage.h
@@ -22,7 +22,7 @@
 
 #include "KexiDBTitlePageBase.h"
 
-//! @short A helper widget used to displaying a line edit with a label and tqlayout
+//! @short A helper widget used to displaying a line edit with a label and layout
 class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase
 {
 	Q_OBJECT
diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui
index 7b711ea3..e8a00ef9 100644
--- a/kexi/main/startup/KexiDBTitlePageBase.ui
+++ b/kexi/main/startup/KexiDBTitlePageBase.ui
@@ -40,7 +40,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>111</height>
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -76,7 +76,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 79f763ee..122137e1 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -74,7 +74,7 @@
                 <string>Kexi will create a new database project. Select a storage method which will be used to store the new project.
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index b24a66ab..9842cb41 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -46,7 +46,7 @@
 #include <tqobjectlist.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqheader.h>
 
@@ -96,7 +96,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	//page: type selector
 	m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector");
 //	lv_types = new KListView(m_prjtype_sel, "types listview");
-//	m_prjtype_sel->lv_types->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
+//	m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
 #if KDE_IS_VERSION(3,3,9)
 	m_prjtype_sel->lv_types->setShadeSortColumn(false);
 #endif
@@ -127,8 +127,8 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*)));
 	connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*)));
 
-//	static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types);
-//	static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertStretch(3,1);
+//	static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types);
+//	static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1);
 //	updateGeometry();
 
 	addPage(m_prjtype_sel, i18n("Select Storage Method"));
@@ -142,7 +142,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	m_conn_sel_widget = new TQWidget(this);
 	TQVBoxLayout* conn_sel_lyr = new TQVBoxLayout(m_conn_sel_widget);
 	TQLabel *conn_sel_label = new TQLabel(i18n("Enter a new Kexi project's file name:"), m_conn_sel_widget);
-	conn_sel_label->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	conn_sel_label->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	conn_sel_lyr->addWidget( conn_sel_label );
 	conn_sel_lyr->addSpacing(KDialogBase::spacingHint());
 
@@ -301,7 +301,7 @@ void KexiNewProjectWizard::next()
 				return;
 			}
 			m_project_selector->label->setText(
-				d->server_db_name_dblist_lbl_txt.tqarg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) );
+				d->server_db_name_dblist_lbl_txt.arg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) );
 			m_server_db_name->le_caption->setFocus();
 
 		}
@@ -342,7 +342,7 @@ void KexiNewProjectWizard::accept()
 			if (KMessageBox::Continue!=KMessageBox::warningContinueCancel( this, "<qt>"
 				+i18n("<b>A project with database name \"%1\" already exists</b>"
 				"<p>Do you want to delete it and create a new one?")
-				.tqarg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), 
+				.arg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), 
 				TQString(), KMessageBox::Notify|KMessageBox::Dangerous ))
 			{
 				m_server_db_name->le_dbname->setFocus();
diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui
index f11d7f58..b74936dd 100644
--- a/kexi/main/startup/KexiOpenExistingFile.ui
+++ b/kexi/main/startup/KexiOpenExistingFile.ui
@@ -35,7 +35,7 @@
                 <string>&lt;b&gt;Select existing Kexi project file to open:&lt;/b&gt;
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
@@ -43,7 +43,7 @@
             <property name="name">
                 <cstring>line</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>8</height>
@@ -60,13 +60,13 @@
             <property name="name">
                 <cstring>spacer</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>6</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>6</height>
@@ -75,7 +75,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -112,7 +112,7 @@
                     <property name="text">
                         <string>Click "Advanced" button if you want to find an existing project on a server rather than a file.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 9353e3a6..05cd5293 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -31,7 +31,7 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 
 #include <assert.h>
@@ -248,7 +248,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const ch
 	init(prj_set, showProjectNameColumn, showConnectionColumns);
 	
 	m_sel->label->setText( i18n("Select a project on <b>%1</b> database server to open:")
-		.tqarg(cdata->serverInfoString(false)) );
+		.arg(cdata->serverInfoString(false)) );
 }
 
 KexiProjectSelectorDialog::~KexiProjectSelectorDialog()
diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui
index 18c80544..5159d9bb 100644
--- a/kexi/main/startup/KexiProjectSelectorBase.ui
+++ b/kexi/main/startup/KexiProjectSelectorBase.ui
@@ -43,7 +43,7 @@
                 <string>&lt;b&gt;There are Kexi projects you have recently opened.&lt;/b&gt; Select one you wish to open:
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
@@ -103,7 +103,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>60</height>
diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui
index b423d467..f482ed73 100644
--- a/kexi/main/startup/KexiServerDBNamePage.ui
+++ b/kexi/main/startup/KexiServerDBNamePage.ui
@@ -44,7 +44,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -55,7 +55,7 @@
             <property name="name">
                 <cstring>le_dbname</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -72,7 +72,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
@@ -128,7 +128,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>12</height>
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index c479a4e0..d405aee3 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -54,7 +54,7 @@
 
 #include <tqcstring.h>
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 namespace Kexi {
 	static KStaticDeleter<KexiStartupHandler> Kexi_startupHandlerDeleter;
@@ -126,7 +126,7 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen)
 			if (ok && percent>=0 && percent<=100 && pd->progressBar()->progress()<percent) {
 //				kdDebug() << percent << endl;
 				pd->progressBar()->setProgress(percent);
-				tqApp->tqprocessEvents(100);
+				tqApp->processEvents(100);
 			}
 		}
 	}
@@ -144,13 +144,13 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD
 	 + i18n("Please enter the password.") + "</p>";
 /*		msg += cdata.userName.isEmpty() ?
 			"<p>"+i18n("Please enter the password.")
-			: "<p>"+i18n("Please enter the password for user.").tqarg("<b>"+cdata.userName+"</b>");*/
+			: "<p>"+i18n("Please enter the password for user.").arg("<b>"+cdata.userName+"</b>");*/
 
 	TQString srv = cdata.serverInfoString(false);
 	if (srv.isEmpty() || srv.lower()=="localhost")
 		srv = i18n("local database server");
 
-	msg += ("</p><p>"+i18n("Database server: %1").tqarg(TQString("<nobr>")+srv+"</nobr>")+"</p>");
+	msg += ("</p><p>"+i18n("Database server: %1").arg(TQString("<nobr>")+srv+"</nobr>")+"</p>");
 		
 	TQString usr;
 	if (cdata.userName.isEmpty())
@@ -158,7 +158,7 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD
 	else
 		usr = cdata.userName;
 	
-	msg += ("<p>"+i18n("Username: %1").tqarg(usr)+"</p>");
+	msg += ("<p>"+i18n("Username: %1").arg(usr)+"</p>");
 
 	setPrompt( msg );
 	if (showDetailsButton) {
@@ -176,7 +176,7 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog()
 void KexiDBPasswordDialog::done(int r)
 {
 	if (r == TQDialog::Accepted) {
-		m_cdata->password = TQString::tqfromLatin1(password());
+		m_cdata->password = TQString::fromLatin1(password());
 	}
 //	if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) {
 /*			} else {
@@ -283,7 +283,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 			KMessageBox::sorry( 0, "<qt>"
 				+i18n("Could not read connection information from connection shortcut "
 				"file <nobr>\"%1\"</nobr>.<br><br>Check whether the file has valid contents.")
-				.tqarg(TQDir::convertSeparators(connectionShortcut.fileName())));
+				.arg(TQDir::convertSeparators(connectionShortcut.fileName())));
 			return false;
 		}
 	}
@@ -295,7 +295,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 	if (args->count()>0 && (!fileType.isEmpty() && fileType!="project" && fileType!="shortcut" && fileType!="connection")) {
 		KMessageBox::sorry( 0, 
 			i18n("You have specified invalid argument (\"%1\") for \"type\" command-line option.")
-			.tqarg(fileType));
+			.arg(fileType));
 		return false;
 	}
 
@@ -364,7 +364,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 	const bool dropDB = args->isSet("dropdb");
 	const bool openExisting = !createDB && !dropDB;
 	const bool readOnly = args->isSet("readonly");
-	const TQString couldnotMsg = TQString::tqfromLatin1("\n")
+	const TQString couldnotMsg = TQString::fromLatin1("\n")
 		+i18n("Could not start Kexi application this way.");
 
 	if (createDB && dropDB) {
@@ -434,7 +434,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 			if (dropDB && !projectFileExists) {
 				KMessageBox::sorry(0, 
 					i18n("Could not remove project.\nThe file \"%1\" does not exist.")
-					.tqarg(TQDir::convertSeparators(cdata.dbFileName())));
+					.arg(TQDir::convertSeparators(cdata.dbFileName())));
 				return 0;
 			}
 		}
@@ -476,7 +476,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 					m_projectData = new KexiProjectData();
 					if (!d->shortcutFile->loadProjectData(*m_projectData, &d->shortcutFileGroupKey)) {
 						KMessageBox::sorry(0, i18n("Could not open shortcut file\n\"%1\".")
-							.tqarg(TQDir::convertSeparators(cdata.fileName())));
+							.arg(TQDir::convertSeparators(cdata.fileName())));
 						delete m_projectData;
 						m_projectData = 0;
 						delete d->shortcutFile;
@@ -509,7 +509,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 					d->connShortcutFile = new KexiDBConnShortcutFile(cdata.fileName());
 					if (!d->connShortcutFile->loadConnectionData(cdata, &d->shortcutFileGroupKey)) {
 						KMessageBox::sorry(0, i18n("Could not open connection data file\n\"%1\".")
-							.tqarg(TQDir::convertSeparators(cdata.fileName())));
+							.arg(TQDir::convertSeparators(cdata.fileName())));
 						delete d->connShortcutFile;
 						d->connShortcutFile = 0;
 						return false;
@@ -612,7 +612,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 		if (!alsoOpenDB) {
 			if (ok) {
 				KMessageBox::information( 0, i18n("Project \"%1\" created successfully.")
-					.tqarg( TQDir::convertSeparators(projectData()->databaseName()) ));
+					.arg( TQDir::convertSeparators(projectData()->databaseName()) ));
 			}
 			return ok;
 		}
@@ -622,7 +622,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 		tristate res = KexiProject::dropProject(projectData(), &gui, false/*ask*/);
 		if (res==true)
 			KMessageBox::information( 0, i18n("Project \"%1\" dropped successfully.")
-				.tqarg( TQDir::convertSeparators(projectData()->databaseName()) ));
+				.arg( TQDir::convertSeparators(projectData()->databaseName()) ));
 		return res!=false;
 	}
 
@@ -749,7 +749,7 @@ tristate KexiStartupHandler::detectActionForFile(
 		if (!(options & SkipMessages))
 			KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 				+i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>")
-				.tqarg(TQDir::convertSeparators(dbFileName))
+				.arg(TQDir::convertSeparators(dbFileName))
 				+i18n("Check the file's permissions and whether it is already opened "
 				"and locked by another application."));
 		return false;
@@ -781,7 +781,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			if (!(options & SkipMessages))
 				KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 					+i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>")
-					.tqarg(TQDir::convertSeparators(dbFileName))
+					.arg(TQDir::convertSeparators(dbFileName))
 					+i18n("Check the file's permissions and whether it is already opened "
 						"and locked by another application."));
 			return false;
@@ -804,7 +804,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo(
 				parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
 				"Do you want to import the file as a Kexi project?")
-				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()),
+				.arg(TQDir::convertSeparators(dbFileName)).arg(ptr.data()->comment()),
 				i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) )
 			{
 				return cancelled;
@@ -830,8 +830,8 @@ tristate KexiStartupHandler::detectActionForFile(
 			 "The project file \"%1\" is recognized as compatible with \"%2\" database driver, "
 			 "while you have asked for \"%3\" database driver to be used.\n"
 			 "Do you want to use \"%4\" database driver?")
-			 .tqarg(TQDir::convertSeparators(dbFileName))
-			 .tqarg(tmpDriverName).tqarg(suggestedDriverName).tqarg(tmpDriverName));
+			 .arg(TQDir::convertSeparators(dbFileName))
+			 .arg(tmpDriverName).arg(suggestedDriverName).arg(tmpDriverName));
 		if (KMessageBox::Yes == res)
 			useDetectedDriver = true;
 		else if (KMessageBox::Cancel == res)
@@ -851,7 +851,7 @@ tristate KexiStartupHandler::detectActionForFile(
 		&& KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n(
 			"Previous version of database file format (\"%1\") is detected in the \"%2\" "
 			"project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?")
-			.tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) )
+			.arg(detectedDriverName).arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat)) )
 	{
 //		SQLite2ToSQLite3Migration *migr = new 
 		SQLite2ToSQLite3Migration migr( finfo.absFilePath() );
@@ -862,7 +862,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			KMessageBox::sorry(parent, i18n(
 				"Failed to convert project file \"%1\" to a new \"%2\" format.\n"
 				"The file format remains unchanged.")
-				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) );
+				.arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat) );
 			//continue...
 		}
 		if (res==true)
@@ -872,19 +872,19 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (detectedDriverName.isEmpty()) {
 		TQString possibleProblemsInfoMsg( Kexi::driverManager().possibleProblemsInfoMsg() );
 		if (!possibleProblemsInfoMsg.isEmpty()) {
-			possibleProblemsInfoMsg.prepend(TQString::tqfromLatin1("<p>")+i18n("Possible problems:"));
-			possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>");
+			possibleProblemsInfoMsg.prepend(TQString::fromLatin1("<p>")+i18n("Possible problems:"));
+			possibleProblemsInfoMsg += TQString::fromLatin1("</p>");
 		}
 		if (!(options & SkipMessages))
 			KMessageBox::detailedSorry(parent, 
 				i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
-					.tqarg(TQDir::convertSeparators(dbFileName)),
-				TQString::tqfromLatin1("<p>")
+					.arg(TQDir::convertSeparators(dbFileName)),
+				TQString::fromLatin1("<p>")
 				+i18n("Database driver for this file type not found.\nDetected MIME type: %1")
-					.tqarg(mimename)
+					.arg(mimename)
 				+(ptr.data()->comment().isEmpty() 
-					? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment()))
-				+TQString::tqfromLatin1("</p>")
+					? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").arg(ptr.data()->comment()))
+				+TQString::fromLatin1("</p>")
 				+possibleProblemsInfoMsg);
 		return false;
 	}
@@ -894,7 +894,7 @@ tristate KexiStartupHandler::detectActionForFile(
 KexiProjectData*
 KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent)
 {
-	cleartqStatus();
+	clearStatus();
 	cancelled = false;
 	if (!cdata)
 		return 0;
@@ -917,13 +917,13 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled
 		if (prjdlg.projectSet())
 			msgh.showErrorMessage(prjdlg.projectSet(), 
 				i18n("Could not load list of available projects for <b>%1</b> database server.")
-				.tqarg(cdata->serverInfoString(true)));
+				.arg(cdata->serverInfoString(true)));
 		else
 			msgh.showErrorMessage(
 				i18n("Could not load list of available projects for <b>%1</b> database server.")
-				.tqarg(cdata->serverInfoString(true)));
-//		settqStatus(i18n("Could not load list of available projects for database server \"%1\"")
-//		.tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg());
+				.arg(cdata->serverInfoString(true)));
+//		setStatus(i18n("Could not load list of available projects for database server \"%1\"")
+//		.arg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg());
 		return 0;
 	}
 	if (prjdlg.exec()!=TQDialog::Accepted) {
@@ -952,7 +952,7 @@ void KexiStartupHandler::slotSaveShortcutFileChanges()
 
 	if (!ok) {
 		KMessageBox::sorry(0, i18n("Failed saving connection data to\n\"%1\" file.")
-			.tqarg(TQDir::convertSeparators(d->shortcutFile->fileName())));
+			.arg(TQDir::convertSeparators(d->shortcutFile->fileName())));
 	}
 }
 
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index fe1b3cf0..23d8e832 100644
--- a/kexi/main/startup/KexiStartup.h
+++ b/kexi/main/startup/KexiStartup.h
@@ -59,7 +59,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog
 /*! Handles startup actions for Kexi application.
 */
 class KEXIMAIN_EXPORT KexiStartupHandler 
-	: public TQObject, public KexiStartupData, public Kexi::ObjecttqStatus
+	: public TQObject, public KexiStartupData, public Kexi::ObjectStatus
 {
 	Q_OBJECT
   TQ_OBJECT
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 7f67bc76..b2ad8cfd 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -25,7 +25,7 @@
 #include "KexiConnSelector.h"
 #include "KexiConnSelectorBase.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -324,7 +324,7 @@ void KexiStartupDialog::setupPageTemplates()
 	tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
 	TQLabel *lbl_blank = new TQLabel( 
 		i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame );
-	lbl_blank->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_blank->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_blank->setMargin(0);
 	tmplyr->addWidget( lbl_blank );
 	tmplyr->addStretch(1);
@@ -342,7 +342,7 @@ void KexiStartupDialog::setupPageTemplates()
 	TQLabel *lbl_templ = new TQLabel( 
 		i18n("Kexi will create a new database project using selected template.\n"
 		"Select template and click \"OK\" button to proceed."), templPageFrame );
-	lbl_templ->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_templ->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_templ->setMargin(0);
 	tmplyr->addWidget( lbl_templ );
 
@@ -389,7 +389,7 @@ void KexiStartupDialog::setupPageTemplates()
 	TQLabel *lbl_import = new TQLabel( 
 		i18n("Kexi will import the structure and data of an existing database as a new database project.")
 		+clickMsg, templPageFrame );
-	lbl_import->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_import->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_import->setMargin(0);
 	tmplyr->addWidget( lbl_import );
 	tmplyr->addStretch(1);
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index 429499f4..d919463d 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -123,8 +123,8 @@ void TemplatesPage::itemClicked(TQIconViewItem *item) {
 		return;
 	}
 	TQString t = TQString("<h2>%1</h2><p>%2</p>")
-		.tqarg(static_cast<TemplateItem*>(item)->name)
-		.tqarg(static_cast<TemplateItem*>(item)->description);
+		.arg(static_cast<TemplateItem*>(item)->name)
+		.arg(static_cast<TemplateItem*>(item)->description);
 #ifndef DB_TEMPLATES
 	t += TQString("<p>") + i18n("We are sorry, templates are not yet available.") +"</p>";
 #endif
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index cd54602b..8dd74298 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -23,7 +23,7 @@
 #include <core/kexi.h>
 #include <kexiutils/utils.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqpushbutton.h>
 #include <tqapplication.h>
@@ -42,14 +42,14 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 	, m_confirmOverwrites(true)
 	, m_filtersUpdated(false)
 {
-	tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
+	setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
 	setMode( mode );
 	
 	TQPoint point( 0, 0 );
 	reparent( parentWidget(), point );
 
-	if (tqlayout())
-		tqlayout()->setMargin(0);
+	if (layout())
+		layout()->setMargin(0);
 	setMinimumHeight(100);
 	setSizeGripEnabled ( false );
 
@@ -300,7 +300,7 @@ bool KexiStartupFileDialog::checkFileName()
 		if (mode() & KFile::ExistingOnly) {
 			if ( !fi.exists() ) {
 				KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" does not exist." )
-					.tqarg( TQDir::convertSeparators(path) ) );
+					.arg( TQDir::convertSeparators(path) ) );
 				return false;
 			}
 			else if (mode() & KFile::File) {
@@ -310,7 +310,7 @@ bool KexiStartupFileDialog::checkFileName()
 				}
 				else if (!fi.isReadable()) {
 					KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" is not readable." )
-						.tqarg( TQDir::convertSeparators(path) ) );
+						.arg( TQDir::convertSeparators(path) ) );
 					return false;
 				}
 			}
@@ -329,7 +329,7 @@ bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget
 	if (!fi.exists())
 		return true;
 	const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n"
-		"Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(), 
+		"Do you want to overwrite it?").arg( TQDir::convertSeparators(filePath) ), TQString(), 
 			i18n("Overwrite"), KStdGuiItem::no() );
 	if (res == KMessageBox::Yes)
 		return true;
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index c81de131..36b8c527 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -120,27 +120,27 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 /*
     KURL u;
     u.setPath( TQDir::rootDirPath() );
-    TQString text = i18n("Root Directory: %1").tqarg( u.path() );
+    TQString text = i18n("Root Directory: %1").arg( u.path() );
     d->pathCombo->addDefaultURL( u,
                                  KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
 
     u.setPath( TQDir::homeDirPath() );
-    text = i18n("Home Directory: %1").tqarg( u.path( +1 ) );
+    text = i18n("Home Directory: %1").arg( u.path( +1 ) );
     d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
 
     KURL docPath;
     docPath.setPath( KGlobalSettings::documentPath() );
     if ( u.path(+1) != docPath.path(+1) ) {
-        text = i18n("Documents: %1").tqarg( docPath.path( +1 ) );
+        text = i18n("Documents: %1").arg( docPath.path( +1 ) );
         d->pathCombo->addDefaultURL( u,
                                      KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                      text );
     }
 
     u.setPath( KGlobalSettings::desktopPath() );
-    text = i18n("Desktop: %1").tqarg( u.path( +1 ) );
+    text = i18n("Desktop: %1").arg( u.path( +1 ) );
     d->pathCombo->addDefaultURL( u,
                                  KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
@@ -185,7 +185,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     coll->action( "up" )->plug( toolbar );
     coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the parent directory.<p>"
                                             "For instance, if the current location is file:/home/%1 clicking this "
-                                            "button will take you to file:/home.</qt>").tqarg(getlogin()));
+                                            "button will take you to file:/home.</qt>").arg(getlogin()));
     coll->action( "back" )->plug( toolbar );
     coll->action( "back" )->setWhatsThis(i18n("Click this button to move backwards one step in the browsing history."));
     coll->action( "forward" )->plug( toolbar );
@@ -197,7 +197,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new directory."));
 
     d->bookmarkHandler = new KFileBookmarkHandler( this );
-    toolbar->insertButton(TQString::tqfromLatin1("bookmark"),
+    toolbar->insertButton(TQString::fromLatin1("bookmark"),
                           (int)HOTLIST_BUTTON, true,
                           i18n("Bookmarks"));
     toolbar->getButton(HOTLIST_BUTTON)->setPopup( d->bookmarkHandler->menu(),
@@ -441,7 +441,7 @@ void KexiStartupFileDialogBase::setMimeFilter( const TQStringList& mimeTypes,
 //(js)    filterWidget->setMimeFilter( mimeTypes, defaultType );
 
 //(js)    TQStringList types = TQStringList::split(" ", filterWidget->currentFilter());
-//(js)    types.append( TQString::tqfromLatin1( "inode/directory" ));
+//(js)    types.append( TQString::fromLatin1( "inode/directory" ));
 //(js)    ops->clearFilter();
 //(js)    ops->setMimeFilter( types );
 //(js)    d->hasDefaultFilter = !defaultType.isEmpty();
diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp
index e8139e18..e959ccdc 100644
--- a/kexi/main/startup/KexiStartup_p.cpp
+++ b/kexi/main/startup/KexiStartup_p.cpp
@@ -73,7 +73,7 @@ tristate SQLite2ToSQLite3Migration::run()
 
 	m_dlg = new KProgressDialog(0, 0, TQString(), 
 		i18n("Saving \"%1\" project file to a new \"%2\" database format...")
-		.tqarg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).tqarg("SQLite3")
+		.arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3")
 	);
 	m_dlg->setModal(true);
 	connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()));