Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

41 files changed, 154 insertions, 154 deletions

diff --git a/kexi/plugins/forms/kexidataawarewidgetinfo.cpp b/kexi/plugins/forms/kexidataawarewidgetinfo.cpp
index 0947c8a1..a6033c70 100644
--- a/kexi/plugins/forms/kexidataawarewidgetinfo.cpp
+++ b/kexi/plugins/forms/kexidataawarewidgetinfo.cpp
@@ -26,8 +26,8 @@ KexiDataAwareWidgetInfo::KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f
 }
 
 KexiDataAwareWidgetInfo::KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f, 
-	const char* tqparentFactoryName, const char* inheritedClassName)
- : KFormDesigner::WidgetInfo(f, tqparentFactoryName, inheritedClassName)
+	const char* parentFactoryName, const char* inheritedClassName)
+ : KFormDesigner::WidgetInfo(f, parentFactoryName, inheritedClassName)
 {
 	init();
 }
diff --git a/kexi/plugins/forms/kexidataawarewidgetinfo.h b/kexi/plugins/forms/kexidataawarewidgetinfo.h
index eddcf909..41e67d85 100644
--- a/kexi/plugins/forms/kexidataawarewidgetinfo.h
+++ b/kexi/plugins/forms/kexidataawarewidgetinfo.h
@@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiDataAwareWidgetInfo : public KFormDesigner::Widge
 		KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f);
 		
 		KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f, 
-			const char* tqparentFactoryName, const char* inheritedClassName = 0);
+			const char* parentFactoryName, const char* inheritedClassName = 0);
 
 		virtual ~KexiDataAwareWidgetInfo();
 
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 400e6d37..3e1e5c4b 100644
--- a/kexi/plugins/forms/kexidataprovider.cpp
+++ b/kexi/plugins/forms/kexidataprovider.cpp
@@ -64,7 +64,7 @@ void KexiFormDataProvider::setMainDataSourceWidget(TQWidget* mainWidget)
 		KexiFormDataItemInterface* const formDataItem = dynamic_cast<KexiFormDataItemInterface*>(obj);
 		if (!formDataItem)
 			continue;
-		if (formDataItem->tqparentInterface()) //item with tqparent interface: collect tqparent instead...
+		if (formDataItem->parentInterface()) //item with tqparent interface: collect tqparent instead...
 			continue;
 #if 0 //! @todo reenable when subform is moved to KexiDBForm
 		KexiDBForm *dbForm = KexiUtils::findParent<KexiDBForm>(obj, "KexiDBForm"); //form's surface...
@@ -183,7 +183,7 @@ bool KexiFormDataProvider::cursorAtNewRow() const
 	return false;
 }
 
-void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidSources,
+void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSources,
  KexiDB::QuerySchema* query)
 {
 	//fill m_fieldNumbersForDataItems mapping from data item to field number
@@ -222,7 +222,7 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		//all previous indices have corresponding data source
 //		for (; i < (*it); i++) {
 //			newIndices[i] = number++;
-			//kexipluginsdbg << "tqinvalidateDataSources(): " << i << " -> " << number-1 << endl;
+			//kexipluginsdbg << "invalidateDataSources(): " << i << " -> " << number-1 << endl;
 //		}
 		//this index have no corresponding data source
 //		newIndices[i]=-1;
@@ -230,14 +230,14 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		if (item)
 			item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
 		m_dataItems.remove(*it);
-		kexipluginsdbg << "tqinvalidateDataSources(): " << (*it) << " -> " << -1 << endl;
+		kexipluginsdbg << "invalidateDataSources(): " << (*it) << " -> " << -1 << endl;
 //		i++;
 	}
 #endif
 	//fill remaining part of the vector
 //	for (; i < dataFieldsCount; i++) { //m_dataItems.count(); i++) {
 		//newIndices[i] = number++;
-		//kexipluginsdbg << "tqinvalidateDataSources(): " << i << " -> " << number-1 << endl;
+		//kexipluginsdbg << "invalidateDataSources(): " << i << " -> " << number-1 << endl;
 	//}
 
 #if 0
@@ -247,11 +247,11 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		bool ok;
 		const int newIndex = newIndices.at( it.data(), &ok );
 		if (ok && newIndex!=-1) {
-			kexipluginsdbg << "tqinvalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl;
+			kexipluginsdbg << "invalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl;
 			newFieldNumbersForDataItems.tqreplace(it.key(), newIndex);
 		}
 		else {
-			kexipluginsdbg << "tqinvalidateDataSources(): removing " << it.key()->dataSource() << endl;
+			kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl;
 			m_dataItems.remove(it.key());
 			it.key()->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
 		}
@@ -266,7 +266,7 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		query->debug();
 
 	//if (query && m_dataItems.count()!=query->fieldCount()) {
-	//	kdWarning() << "KexiFormDataProvider::tqinvalidateDataSources(): m_dataItems.count()!=query->fieldCount() ("
+	//	kdWarning() << "KexiFormDataProvider::invalidateDataSources(): m_dataItems.count()!=query->fieldCount() ("
 	//	 << m_dataItems.count() << "," << query->fieldCount() << ")" << endl;
 	//}
 	//i = 0;
diff --git a/kexi/plugins/forms/kexidataprovider.h b/kexi/plugins/forms/kexidataprovider.h
index f1e9d755..9c630cb4 100644
--- a/kexi/plugins/forms/kexidataprovider.h
+++ b/kexi/plugins/forms/kexidataprovider.h
@@ -74,7 +74,7 @@ class KEXIFORMUTILS_EXPORT KexiFormDataProvider : public KexiDataItemChangesList
 		 \a invalidSources is the set of data sources that should 
 		 be omitted for fillDataItems(). 
 		 Used by KexiFormView::initDataSource(). */
-		void tqinvalidateDataSources( const TQDict<char>& invalidSources, 
+		void invalidateDataSources( const TQDict<char>& invalidSources, 
 			KexiDB::QuerySchema* query = 0 );
 
 		/*! Fills the same data provided by \a value to every data item (other than \a item) 
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 5f379e6e..8683c2bb 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -646,7 +646,7 @@ KexiDBFactory::isPropertyVisibleInternal(const TQCString& classname, TQWidget *w
 	}
 	else if(classname == "KexiDBCheckBox") {
 		//hide text property if the widget is a child of an autofield beause there's already "caption" for this purpose
-		if (property=="text" && w && dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w->tqparentWidget()))
+		if (property=="text" && w && dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w->parentWidget()))
 			return false;
 		ok = property!="autoRepeat";
 	}
diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h
index f15f8c39..79873b72 100644
--- a/kexi/plugins/forms/kexidbfactory.h
+++ b/kexi/plugins/forms/kexidbfactory.h
@@ -51,7 +51,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory
 		virtual bool clearWidgetContent(const TQCString &classname, TQWidget *w);
 
 		//virtual void		saveSpecialProperty(const TQString &classname, const TQString &name, const TQVariant &value, TQWidget *w,
-		         //TQDomElement &tqparentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
 		//virtual void            readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item) {}
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
 
diff --git a/kexi/plugins/forms/kexiformdataiteminterface.cpp b/kexi/plugins/forms/kexiformdataiteminterface.cpp
index 9a861917..c588c7b1 100644
--- a/kexi/plugins/forms/kexiformdataiteminterface.cpp
+++ b/kexi/plugins/forms/kexiformdataiteminterface.cpp
@@ -61,8 +61,8 @@ void KexiFormDataItemInterface::setDisplayDefaultValue(TQWidget* widget, bool di
 
 void KexiFormDataItemInterface::cancelEditor()
 {
-	TQWidget *tqparentWidget = dynamic_cast<TQWidget*>(this)->tqparentWidget();
-	KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(tqparentWidget, "KexiFormScrollView");
+	TQWidget *parentWidget = dynamic_cast<TQWidget*>(this)->parentWidget();
+	KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(parentWidget, "KexiFormScrollView");
 	if (view)
 		view->cancelEditor();
 }
diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp
index 9f288418..ce9b142b 100644
--- a/kexi/plugins/forms/kexiformmanager.cpp
+++ b/kexi/plugins/forms/kexiformmanager.cpp
@@ -70,7 +70,7 @@ KAction* KexiFormManager::action( const char* name )
 	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
 	if (!formViewWidget)
 		return 0;
-	return formViewWidget->tqparentDialog()->mainWin()->actionCollection()->action(n.data());
+	return formViewWidget->parentDialog()->mainWin()->actionCollection()->action(n.data());
 }
 
 KexiFormView* KexiFormManager::activeFormViewWidget() const
@@ -90,7 +90,7 @@ void KexiFormManager::enableAction( const char* name, bool enable )
 	KexiFormView* formViewWidget = activeFormViewWidget();
 	if (!formViewWidget)
 		return;
-//	if (TQString(name)=="tqlayout_menu")
+//	if (TQString(name)=="layout_menu")
 //		kdDebug() << "!!!!!!!!!!! " << enable << endl;
 	formViewWidget->setAvailable(translateName( name ).latin1(), enable);
 }
diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h
index d25cf78e..34decc1d 100644
--- a/kexi/plugins/forms/kexiformmanager.h
+++ b/kexi/plugins/forms/kexiformmanager.h
@@ -77,7 +77,7 @@ TQString KexiFormManager::translateName( const char* name ) const
 {
 	TQString n( name );
 	//translate to our name space:
-	if (n.startsWith("align_") || n.startsWith("adjust_") || n.startsWith("tqlayout_")
+	if (n.startsWith("align_") || n.startsWith("adjust_") || n.startsWith("layout_")
 		|| n=="format_raise" || n=="format_raise" || n=="taborder" | n=="break_layout")
 	{
 		n.prepend("formpart_");
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 2486416e..3f1d3466 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -428,7 +428,7 @@ void KexiFormPart::slotAssignAction()
 	if (!formViewWidget)
 		return;
 
-	KexiMainWindow * mainWin = formViewWidget->tqparentDialog()->mainWin();
+	KexiMainWindow * mainWin = formViewWidget->parentDialog()->mainWin();
 	KexiActionSelectionDialog dlg(mainWin, dbform, data, 
 		propSet->property("name").value().toCString());
 
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index 2ddcb123..057e0a33 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -557,7 +557,7 @@ void KexiFormScrollView::handleDataWidgetAction(const TQString& actionName)
 		item = dynamic_cast<KexiFormDataItemInterface*>(w);
 		if (item)
 			break;
-		w = w->tqparentWidget();
+		w = w->parentWidget();
 	}
 	if (item)
 		item->handleAction(actionName);
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 189d515f..3f30fff2 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -121,12 +121,12 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent,
 		plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo()));
 
 		plugSharedAction("formpart_layout_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()) );
-		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()) );
-		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()) );
+		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()) );
+		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()) );
+		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()) );
 #ifdef KEXI_SHOW_SPLITTER_WIDGET
-		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()) );
-		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()) );
+		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()) );
+		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()) );
 #endif
 		plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()) );
 
@@ -167,7 +167,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent,
 KexiFormView::~KexiFormView()
 {
 	if (m_cursor) {
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->deleteCursor(m_cursor);
 		m_cursor = 0;
 	}
@@ -184,7 +184,7 @@ void
 KexiFormView::deleteQuery()
 {
 	if (m_cursor) {
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->deleteCursor(m_cursor);
 		m_cursor = 0;
 	}
@@ -229,7 +229,7 @@ KexiFormView::initForm()
 			KFormDesigner::FormManager::self(), TQT_SLOT(slotHistoryCommandExecuted()));
 	}
 
-	const bool newForm = tqparentDialog()->id() < 0;
+	const bool newForm = parentDialog()->id() < 0;
 
 	KexiDB::FieldList *fields = 0;
 	if (newForm) {
@@ -296,7 +296,7 @@ void KexiFormView::updateAutoFieldsDataSource()
 	//(this data has not been stored in the form)
 	TQString dataSourceString( m_dbform->dataSource() );
 	TQCString dataSourceMimeTypeString( m_dbform->dataSourceMimeType() );
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableOrQuerySchema tableOrQuery(
 		conn, dataSourceString.latin1(), dataSourceMimeTypeString=="kexi/table");
 	if (!tableOrQuery.table() && !tableOrQuery.query())
@@ -325,7 +325,7 @@ void KexiFormView::updateValuesForSubproperties()
 	//(this data has not been stored in the form)
 	TQString dataSourceString( m_dbform->dataSource() );
 	TQCString dataSourceMimeTypeString( m_dbform->dataSourceMimeType() );
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableOrQuerySchema tableOrQuery(
 		conn, dataSourceString.latin1(), dataSourceMimeTypeString=="kexi/table");
 	if (!tableOrQuery.table() && !tableOrQuery.query())
@@ -390,7 +390,7 @@ KexiFormView::loadForm()
 {
 //@todo also load m_resizeMode !
 
-	kexipluginsdbg << "KexiFormView::loadForm() Loading the form with id : " << tqparentDialog()->id() << endl;
+	kexipluginsdbg << "KexiFormView::loadForm() Loading the form with id : " << parentDialog()->id() << endl;
 	// If we are previewing the Form, use the tempData instead of the form stored in the db
 	if(viewMode()==Kexi::DataViewMode && !tempData()->tempForm.isNull() )
 	{
@@ -416,7 +416,7 @@ KexiFormView::loadForm()
 void
 KexiFormView::slotPropertySetSwitched(KoProperty::Set *set, bool forceReload, const TQCString& propertyToSelect)
 {
-//	if (set && tqparentDialog()!=tqparentDialog()->mainWin()->currentDialog())
+//	if (set && parentDialog()!=parentDialog()->mainWin()->currentDialog())
 	if (form() != KFormDesigner::FormManager::self()->activeForm())
 		return; //this is not the current form view
 	m_propertySet = set;
@@ -470,7 +470,7 @@ tristate
 KexiFormView::afterSwitchFrom(int mode)
 {
 	if (mode == 0 || mode == Kexi::DesignViewMode) {
-		if (tqparentDialog()->neverSaved()) {
+		if (parentDialog()->neverSaved()) {
 			m_dbform->resize(TQSize(400, 300));
 			m_scrollView->refreshContentsSizeLater(true,true);
 			//m_delayedFormContentsResizeOnShow = false;
@@ -521,7 +521,7 @@ KexiFormView::afterSwitchFrom(int mode)
 		initDataSource();
 
 		//handle events for this form
-		m_scrollView->setMainWidgetForEventHandling(tqparentDialog()->mainWin(), m_dbform);
+		m_scrollView->setMainWidgetForEventHandling(parentDialog()->mainWin(), m_dbform);
 
 		//set focus on 1st focusable widget which has valid dataSource property set
 		if (!m_dbform->orderedFocusWidgets()->isEmpty()) {
@@ -555,7 +555,7 @@ KexiFormView::afterSwitchFrom(int mode)
 
 	//dirty only if it's a new object
 	if (mode == 0)
-		setDirty( tqparentDialog()->partItem()->neverSaved() );
+		setDirty( parentDialog()->partItem()->neverSaved() );
 
 	if (mode==Kexi::DataViewMode && viewMode()==Kexi::DesignViewMode) {
 //		slotPropertySetSwitched
@@ -590,7 +590,7 @@ void KexiFormView::initDataSource()
 		//collect all data-aware widgets and create query schema
 		m_scrollView->setMainDataSourceWidget(m_dbform);
 		sources = m_scrollView->usedDataSources();
-		conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		conn = parentDialog()->mainWin()->project()->dbConnection();
 		if (dataSourceMimeTypeString.isEmpty() /*table type is the default*/ 
 			|| dataSourceMimeTypeString=="kexi/table")
 		{
@@ -681,7 +681,7 @@ void KexiFormView::initDataSource()
 			if (ok) //input cancelled
 				m_cursor = conn->executeQuery( *m_query, params );
 		}
-		m_scrollView->tqinvalidateDataSources( invalidSources, m_query );
+		m_scrollView->invalidateDataSources( invalidSources, m_query );
 		ok = m_cursor!=0;
 	}
 
@@ -730,7 +730,7 @@ KexiFormView::storeNewData(const KexiDB::SchemaData& sdata, bool &cancel)
 	}
 	if (!storeData()) {
 		//failure: remove object's schema data to avoid garbage
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->removeObject( s->id() );
 		delete s;
 		return 0;
@@ -742,12 +742,12 @@ tristate
 KexiFormView::storeData(bool dontAsk)
 {
 	Q_UNUSED(dontAsk);
-	kexipluginsdbg << "KexiDBForm::storeData(): " << tqparentDialog()->partItem()->name() 
-		<< " [" << tqparentDialog()->id() << "]" << endl;
+	kexipluginsdbg << "KexiDBForm::storeData(): " << parentDialog()->partItem()->name() 
+		<< " [" << parentDialog()->id() << "]" << endl;
 
 	//-- first, store local BLOBs, so identifiers can be updated
 //! @todo remove unused data stored previously
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableSchema *blobsTable = conn->tableSchema("kexi__blobs");
 	if (!blobsTable) { //compatibility check for older Kexi project versions
 //! @todo show message about missing kexi__blobs?
@@ -767,7 +767,7 @@ KexiFormView::storeData(bool dontAsk)
 	}
 	KexiBLOBBuffer *blobBuf = KexiBLOBBuffer::self();
 	KexiFormView *designFormView 
-		= dynamic_cast<KexiFormView*>( tqparentDialog()->viewForMode(Kexi::DesignViewMode) );
+		= dynamic_cast<KexiFormView*>( parentDialog()->viewForMode(Kexi::DesignViewMode) );
 	if (designFormView) {
 		for (TQMapConstIterator<TQWidget*, KexiBLOBBuffer::Id_t> it = tempData()->unsavedLocalBLOBs.constBegin(); 
 			it!=tempData()->unsavedLocalBLOBs.constEnd(); ++it)
@@ -874,7 +874,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple)
 
 	KFormDesigner::Container *container = f->activeContainer();
 	setAvailable("formpart_break_layout", container ?
-		(container->tqlayoutType() != KFormDesigner::Container::NoLayout) : false );
+		(container->layoutType() != KFormDesigner::Container::NoLayout) : false );
 }
 
 void
@@ -890,7 +890,7 @@ KexiFormView::slotFormWidgetSelected(KFormDesigner::Form *f)
 	setAvailable("formpart_layout_hbox", true);
 	setAvailable("formpart_layout_vbox", true);
 	setAvailable("formpart_layout_grid", true);
-	setAvailable("formpart_break_layout", (f->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	setAvailable("formpart_break_layout", (f->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -967,9 +967,9 @@ KexiFormView::setRedoEnabled(bool enabled)
 TQSize
 KexiFormView::preferredSizeHint(const TQSize& otherSize)
 {
-	if (tqparentDialog()->neverSaved()) {
+	if (parentDialog()->neverSaved()) {
 		//ignore otherSize if possible
-//		return KexiViewBase::preferredSizeHint( (tqparentDialog() && tqparentDialog()->mdiParent()) ? TQSize(10000,10000) : otherSize);
+//		return KexiViewBase::preferredSizeHint( (parentDialog() && parentDialog()->mdiParent()) ? TQSize(10000,10000) : otherSize);
 	}
 
 	return (m_dbform->size()
@@ -1087,7 +1087,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 	if (fields.isEmpty())
 		return;
 
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableOrQuerySchema tableOrQuery(conn, sourceName.latin1(), sourceMimeType=="kexi/table");
 	if (!tableOrQuery.table() && !tableOrQuery.query()) {
 		kexipluginswarn << "KexiFormView::insertAutoFields(): no such table/query \""
@@ -1132,7 +1132,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 		while (targetContainerWidget 
 			&& !dynamic_cast<KFormDesigner::Container*>(targetContainerWidget))
 		{
-			targetContainerWidget = targetContainerWidget->tqparentWidget();
+			targetContainerWidget = targetContainerWidget->parentWidget();
 		}
 		if (dynamic_cast<KFormDesigner::Container*>(targetContainerWidget))
 			targetContainer = dynamic_cast<KFormDesigner::Container*>(targetContainerWidget);
@@ -1264,12 +1264,12 @@ void KexiFormView::updateActions(bool activated)
 }*/
 
 /*
-void KexiFormView::tqparentDialogDetached()
+void KexiFormView::parentDialogDetached()
 {
 	m_dbform->updateTabStopsOrder(form());
 }
 
-void KexiFormView::tqparentDialogAttached(KMdiChildFrm *)
+void KexiFormView::parentDialogAttached(KMdiChildFrm *)
 {
 	m_dbform->updateTabStopsOrder(form());
 }*/
diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index e699afa1..b05a544c 100644
--- a/kexi/plugins/forms/kexiformview.h
+++ b/kexi/plugins/forms/kexiformview.h
@@ -141,7 +141,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		virtual tristate storeData(bool dontAsk = false);
 
 		KexiFormPart::TempData* tempData() const {
-			return dynamic_cast<KexiFormPart::TempData*>(tqparentDialog()->tempData()); }
+			return dynamic_cast<KexiFormPart::TempData*>(parentDialog()->tempData()); }
 		KexiFormPart* formPart() const { return dynamic_cast<KexiFormPart*>(part()); }
 
 //moved to formmanager		void disableWidgetActions();
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 4926a334..521dce2a 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -193,7 +193,7 @@ KexiDBAutoField::createEditor()
 			TQWidget::setFocusPolicy(newSubwidget->focusPolicy());
 		}
 		setFocusProxy(newSubwidget); //ok?
-		if (tqparentWidget())
+		if (parentWidget())
 			newSubwidget->setPalette( tqApp->palette() );
 		copyPropertiesToEditor();
 //		KFormDesigner::installRecursiveEventFilter(newSubwidget, this);
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index a908c2fd..f977a962 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -477,9 +477,9 @@ TQVariant KexiDBComboBox::valueFromInternalEditor()
 TQPoint KexiDBComboBox::mapFromParentToGlobal(const TQPoint& pos) const
 {
 //	const KexiFormScrollView* view = KexiUtils::findParentConst<const KexiFormScrollView>(this, "KexiFormScrollView"); 
-	if (!tqparentWidget())
+	if (!parentWidget())
 		return TQPoint(-1,-1);
-	return tqparentWidget()->mapToGlobal(pos);
+	return parentWidget()->mapToGlobal(pos);
 //	return view->viewport()->mapToGlobal(pos);
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 8c9534d2..cca955e5 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -210,10 +210,10 @@ void
 KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
@@ -234,7 +234,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -425,7 +425,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						while (dataItemIface) {
 							if (dataItemIface->keyPressed(ke))
 								return false;
-							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->tqparentInterface()); //try in tqparent, e.g. in combobox
+							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in tqparent, e.g. in combobox
 						}
 						break;
 					}
@@ -491,13 +491,13 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 			if (tab || backtab) {
 				//the watched widget can be a subwidget of a real widget, e.g. a drop down button of image box: find it
 				while (!KexiFormPart::library()->widgetInfoForClassName(realWidget->className()))
-					realWidget = realWidget->tqparentWidget();
+					realWidget = realWidget->parentWidget();
 				if (!realWidget)
 					return true; //ignore
 				//the watched widget can be a subwidget of a real widget, e.g. autofield: find it
 				//TQWidget* realWidget = TQT_TQWIDGET(watched);
-				while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface())
-					realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface() );
+				while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface())
+					realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface() );
 
 				d->setOrderedFocusWidgetsIteratorTo( realWidget );
 				kexipluginsdbg << realWidget->name() << endl;
@@ -585,7 +585,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 				TQWidget *dataItem = dynamic_cast<TQWidget*>(watched);
 				while (dataItem) {
 					while (dataItem && !dynamic_cast<KexiDataItemInterface*>(dataItem))
-						dataItem = dataItem->tqparentWidget();
+						dataItem = dataItem->parentWidget();
 					if (!dataItem)
 						break;
 					kexipluginsdbg << "KexiDBForm: FocusIn: FOUND " << dataItem->className() << " " << dataItem->name() << endl;
@@ -600,7 +600,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						break;
 					}
 					else
-						dataItem = dataItem->tqparentWidget();
+						dataItem = dataItem->parentWidget();
 
 					dataItem->update();
 				}
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 5f2f20e3..0e79fada 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -608,9 +608,9 @@ void KexiDBImageBox::setDataSource( const TQString &ds )
 	if (!m_lineWidthChanged) {
 		KexiFrame::setLineWidth( ds.isEmpty() ? 0 : 1 );
 	}
-	if (!m_paletteBackgroundColorChanged && tqparentWidget()) {
+	if (!m_paletteBackgroundColorChanged && parentWidget()) {
 		KexiFrame::setPaletteBackgroundColor( 
-			dataSource().isEmpty() ? tqparentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
+			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
 	}
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.h b/kexi/plugins/forms/widgets/kexidblineedit.h
index 4457a8d0..92a87280 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.h
+++ b/kexi/plugins/forms/widgets/kexidblineedit.h
@@ -38,7 +38,7 @@ void setLighterGrayBackgroundColor(TQWidget* widget);
 
 //! @short Line edit widget for Kexi forms
 /*! Handles many data types. User input is validated by using validators 
- and/or input tqmasks.
+ and/or input masks.
 */
 class KEXIFORMUTILS_EXPORT KexiDBLineEdit :
 	public KLineEdit,
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 8cb4f795..6fcd851a 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp
@@ -29,8 +29,8 @@
 #include <formeditor/container.h>
 #include <formeditor/formmanager.h>
 
-KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *tqparentForm, TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_parentForm(tqparentForm), m_form(0), m_widget(0)
+KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name)
+: TQScrollView(tqparent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
@@ -74,7 +74,7 @@ KexiDBSubForm::setFormName(const TQString &name)
 		return;
 	}
 
-	TQWidget *pw = tqparentWidget();
+	TQWidget *pw = parentWidget();
 	KexiFormView *view = 0;
 	TQStringList list;
 	while(pw) {
@@ -87,18 +87,18 @@ KexiDBSubForm::setFormName(const TQString &name)
 		}
 		else if(! view && pw->isA("KexiFormView"))
 			view = static_cast<KexiFormView*>(pw); // we need a KexiFormView*
-		pw = pw->tqparentWidget();
+		pw = pw->parentWidget();
 	}
 
-	if (!view || !view->tqparentDialog() || !view->tqparentDialog()->mainWin()
-		|| !view->tqparentDialog()->mainWin()->project()->dbConnection())
+	if (!view || !view->parentDialog() || !view->parentDialog()->mainWin()
+		|| !view->parentDialog()->mainWin()->project()->dbConnection())
 		return;
 
-	KexiDB::Connection *conn = view->tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = view->parentDialog()->mainWin()->project()->dbConnection();
 
 	// we check if there is a form with this name
 	int id = KexiDB::idForObjectName(*conn, name, KexiPart::FormObjectType);
-	if((id == 0) || (id == view->tqparentDialog()->id())) // == our form
+	if((id == 0) || (id == view->parentDialog()->id())) // == our form
 		return; // because of recursion when loading
 
 	// we create the container widget
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.h b/kexi/plugins/forms/widgets/kexidbsubform.h
index ea2bdbd3..cbbc6250 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.h
+++ b/kexi/plugins/forms/widgets/kexidbsubform.h
@@ -32,7 +32,7 @@ class KEXIFORMUTILS_EXPORT KexiDBSubForm : public TQScrollView
 	TQ_PROPERTY(TQString formName READ formName WRITE setFormName DESIGNABLE true)
 
 	public:
-		KexiDBSubForm(KFormDesigner::Form *tqparentForm, TQWidget *tqparent, const char *name);
+		KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name);
 		~KexiDBSubForm() {}
 
 		//! \return the name of the subform to display inside this widget
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index bc3efc62..3060db2a 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -329,8 +329,8 @@ if ( m_mode == Clipboard )
 		{
 			actionButton( Ok )->setEnabled( false );
 			m_cancelled = true;
-			if (tqparentWidget())
-				tqparentWidget()->raise();
+			if (parentWidget())
+				parentWidget()->raise();
 			return;
 		}
 	}
@@ -443,8 +443,8 @@ bool KexiCSVImportDialog::openData()
 			.tqarg(TQDir::convertSeparators(m_fname)) );
 		actionButton( Ok )->setEnabled( false );
 		m_cancelled = true;
-		if (tqparentWidget())
-			tqparentWidget()->raise();
+		if (parentWidget())
+			parentWidget()->raise();
 		return false;
 	}
 	return true;
@@ -1570,7 +1570,7 @@ void KexiCSVImportDialog::accept()
 	TQDialog::accept();
 	KMessageBox::information(this, i18n("Data has been successfully imported to table \"%1\".")
 		.tqarg(m_destinationTableSchema->name()));
-	tqparentWidget()->raise();
+	parentWidget()->raise();
 	m_conn = 0;
 }
 
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index cc3b6754..d44b8aee 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -206,7 +206,7 @@
         <slot>close()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index 578ba69b..aed4a9bd 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -96,7 +96,7 @@ void KexiMacroProperty::init()
 	m_property->setType( KEXIMACRO_PROPERTYEDITORTYPE ); // use our own propertytype
 }
 
-KoProperty::Property* KexiMacroProperty::tqparentProperty() const
+KoProperty::Property* KexiMacroProperty::parentProperty() const
 {
 	return m_property;
 }
@@ -178,15 +178,15 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro
 	kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty tqparent="<<tqparent->name()<<endl;
 
 	KoProperty::CustomProperty* customproperty = tqparent->customProperty();
-	KexiMacroProperty* tqparentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty);
-	if(! tqparentcustomproperty) {
+	KexiMacroProperty* parentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty);
+	if(! parentcustomproperty) {
 		kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() tqparent=" << tqparent->name() << " has an invalid customproperty." << endl;
 		return 0;
 	}
 
-	KSharedPtr<KoMacro::MacroItem> macroitem = tqparentcustomproperty->macroItem();
+	KSharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem();
 	Q_ASSERT( macroitem.data() != 0 );
-	const TQString name = tqparentcustomproperty->name();
+	const TQString name = parentcustomproperty->name();
 	Q_ASSERT(! name.isEmpty());
 
 	KexiMacroProperty* macroproperty = new KexiMacroProperty(tqparent, macroitem, name);
@@ -297,14 +297,14 @@ class EditListBoxItem : public ListBoxItem
 				kdWarning() << "EditListBoxItem::EditListBoxItem() Skipped cause there exists no action for macroproperty=" << m_macroproperty->name() << endl;
 				return;
 			}
-			KoProperty::Property* tqparentproperty = m_macroproperty->tqparentProperty();
-			if(! tqparentproperty) {
-				kdWarning() << "EditListBoxItem::EditListBoxItem() No tqparentproperty defined" << endl;
+			KoProperty::Property* parentproperty = m_macroproperty->parentProperty();
+			if(! parentproperty) {
+				kdWarning() << "EditListBoxItem::EditListBoxItem() No parentproperty defined" << endl;
 				return;
 			}
 			KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
 			if(! variable.data()) {
-				kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << tqparentproperty->name() << endl;
+				kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << parentproperty->name() << endl;
 				return;
 			}
 
@@ -342,7 +342,7 @@ class EditListBoxItem : public ListBoxItem
 				variable->text(), // caption
 				TQString(), // description
 				type, // type
-				0 //tqparentproperty // tqparent
+				0 //parentproperty // tqparent
 			);
 
 			m_widget = KoProperty::FactoryManager::self()->createWidgetForProperty(m_prop);
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h
index b1c256e9..b80857d1 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.h
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.h
@@ -52,7 +52,7 @@ class KexiMacroProperty
 		virtual ~KexiMacroProperty();
 
 		/** @return the tqparent @a KoProperty::Property instance. */
-		KoProperty::Property* tqparentProperty() const;
+		KoProperty::Property* parentProperty() const;
 
 		/** This function is called by @ref KoProperty::Property::setValue() 
 		when a custom property is set.
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index deec9633..11d9cee5 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -82,7 +82,7 @@ bool KexiMacroTextView::loadData()
 
 tristate KexiMacroTextView::storeData(bool /*dontAsk*/)
 {
-	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id()).tqarg(d->editor->text()) << endl;
+	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()).tqarg(d->editor->text()) << endl;
 	return storeDataBlock( d->editor->text() );
 }
 
diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp
index 507764a7..e13483c1 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroview.cpp
@@ -139,7 +139,7 @@ KexiDB::SchemaData* KexiMacroView::storeNewData(const KexiDB::SchemaData& sdata,
 	if(! storeData()) {
 		kexipluginsdbg << "KexiMacroView::storeNewData() Failed to store the data." << endl;
 		//failure: remove object's schema data to avoid garbage
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->removeObject( schema->id() );
 		delete schema;
 		return 0;
@@ -154,7 +154,7 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/)
 	TQDomElement macroelem = d->macro->toXML();
 	domdoc.appendChild(macroelem);
 	const TQString xml = domdoc.toString(2);
-	const TQString name = TQString("%1 [%2]").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id());
+	const TQString name = TQString("%1 [%2]").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id());
 	kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").tqarg(name).tqarg(xml) << endl;
 	return storeDataBlock(xml);
 }
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui
index cddfa20e..a1f28a79 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -128,7 +128,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index dd5a00d8..e7526413 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -79,7 +79,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index a6205222..5be54145 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -349,7 +349,7 @@ KexiRelationWidget *KexiQueryDesignerGuiEditor::relationView() const
 KexiQueryPart::TempData *
 KexiQueryDesignerGuiEditor::tempData() const
 {
-	return static_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData());
+	return static_cast<KexiQueryPart::TempData*>(parentDialog()->tempData());
 }
 
 static TQString msgCannotSwitch_EmptyDesign() {
@@ -581,7 +581,7 @@ KexiQueryDesignerGuiEditor::beforeSwitchTo(int mode, bool &dontStore)
 //		if (!d->dataTable->dataAwareObject()->acceptRowEdit())
 	//		return cancelled;
 
-		if (!dirty() && tqparentDialog()->neverSaved()) {
+		if (!dirty() && parentDialog()->neverSaved()) {
 			KMessageBox::information(this, msgCannotSwitch_EmptyDesign());
 			return cancelled;
 		}
@@ -618,13 +618,13 @@ tristate
 KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 {
 	const bool was_dirty = dirty();
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	if (mode==Kexi::NoViewMode || (mode==Kexi::DataViewMode && !tempData()->query())) {
 		//this is not a SWITCH but a fresh opening in this view mode
 		if (!m_dialog->neverSaved()) {
 			if (!loadLayout()) {
 				//err msg
-				tqparentDialog()->settqStatus(conn,
+				parentDialog()->settqStatus(conn,
 					i18n("Query definition loading failed."),
 					i18n("Query design may be corrupted so it could not be opened even in text view.\n"
 						"You can delete the query and create it again."));
@@ -633,13 +633,13 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 			// Invalid queries case:
 			// KexiDialogBase::switchToViewMode() first opens DesignViewMode,
 			// and then KexiQueryPart::loadSchemaData() doesn't allocate QuerySchema object
-			// do we're carefully looking at tqparentDialog()->schemaData()
-			KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+			// do we're carefully looking at parentDialog()->schemaData()
+			KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 			if (q) {
 				KexiDB::ResultInfo result;
 				showFieldsForQuery( q, result );
 				if (!result.success) {
-					tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 					tempData()->proposeOpeningInTextViewModeBecauseOfProblems = true;
 					return false;
 				}
@@ -662,7 +662,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 				KexiDB::ResultInfo result;
 				showFieldsAndRelationsForQuery( tempData()->query(), result );
 				if (!result.success) {
-					tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 					return false;
 				}
 			}
@@ -813,7 +813,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 	KexiDB::BaseExpr* e = query->whereExpression();
 	KexiDB::BaseExpr* eItem = 0;
 	while (e) {
-		//eat tqparentheses because the expression can be (....) AND (... AND ... )
+		//eat parentheses because the expression can be (....) AND (... AND ... )
 		while (e && e->toUnary() && e->token()=='(')
 			e = e->toUnary()->arg();
 
@@ -826,7 +826,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 			e = 0;
 		}
 
-		//eat tqparentheses
+		//eat parentheses
 		while (eItem && eItem->toUnary() && eItem->token()=='(')
 			eItem = eItem->toUnary()->arg();
 
@@ -1077,13 +1077,13 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
 		//in a case when query tqlayout was not saved, build tqlayout by hand
 		// -- dynamic cast because of a need for handling invalid queries
 		//    (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()):
-		KexiDB::QuerySchema * q =	dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+		KexiDB::QuerySchema * q =	dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 		if (q) {
 			showTablesForQuery( q );
 			KexiDB::ResultInfo result;
 			showRelationsForQuery( q, result );
 			if (!result.success) {
-				tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+				parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 				return false;
 			}
 		}
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 36455837..e6eb9835 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -222,7 +222,7 @@ KexiQueryDesignerSQLView::beforeSwitchTo(int mode, bool &dontStore)
 			}
 		}
 		else {
-			const bool designViewWasVisible = tqparentDialog()->viewForMode(mode)!=0;
+			const bool designViewWasVisible = parentDialog()->viewForMode(mode)!=0;
 			//should we check SQL text?
 			if (designViewWasVisible 
 				&& !d->justSwitchedFromNoViewMode //unchanged, but we should check SQL text
@@ -274,7 +274,7 @@ KexiQueryDesignerSQLView::beforeSwitchTo(int mode, bool &dontStore)
 	}
 
 	setDirty(true);*/
-//	if (tqparentDialog()->hasFocus())
+//	if (parentDialog()->hasFocus())
 	d->editor->setFocus();
 	return true;
 }
@@ -287,13 +287,13 @@ KexiQueryDesignerSQLView::afterSwitchFrom(int mode)
 	if (mode==Kexi::NoViewMode) {
 		//User opened text view _directly_. 
 		//This flag is set to indicate for beforeSwitchTo() that even if text has not been changed,
-		//SQL text should be tqinvalidated.
+		//SQL text should be invalidated.
 		d->justSwitchedFromNoViewMode = true;
 	}
 	KexiQueryPart::TempData * temp = tempData();
 	KexiDB::QuerySchema *query = temp->query();
 	if (!query) {//try to just get saved schema, instead of temporary one
-		query = dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+		query = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 	}
 
 	if (mode!=0/*failure only if it is switching from prev. view*/ && !query) {
@@ -441,7 +441,7 @@ void KexiQueryDesignerSQLView::slotSelectQuery()
 KexiQueryPart::TempData *
 KexiQueryDesignerSQLView::tempData() const
 {	
-	return dynamic_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData());
+	return dynamic_cast<KexiQueryPart::TempData*>(parentDialog()->tempData());
 }
 
 KexiDB::SchemaData*
diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp
index cf5400dc..9d7cc542 100644
--- a/kexi/plugins/queries/kexiqueryview.cpp
+++ b/kexi/plugins/queries/kexiqueryview.cpp
@@ -83,7 +83,7 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query)
 	}
 	d->cursor = mainWin()->project()->dbConnection()->executeQuery(*query, params);
 	if (!d->cursor) {
-		tqparentDialog()->settqStatus(tqparentDialog()->mainWin()->project()->dbConnection(), 
+		parentDialog()->settqStatus(parentDialog()->mainWin()->project()->dbConnection(), 
 			i18n("Query executing failed."));
 		//todo: also provide server result and sql statement
 		return false;
@@ -108,13 +108,13 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query)
 tristate KexiQueryView::afterSwitchFrom(int mode)
 {
 	if (mode==Kexi::NoViewMode) {
-		KexiDB::QuerySchema *querySchema = static_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+		KexiDB::QuerySchema *querySchema = static_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 		const tristate result = executeQuery(querySchema);
 		if (true != result)
 			return result;
 	}
 	else if (mode==Kexi::DesignViewMode || Kexi::TextViewMode) {
-		KexiQueryPart::TempData * temp = static_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData());
+		KexiQueryPart::TempData * temp = static_cast<KexiQueryPart::TempData*>(parentDialog()->tempData());
 
 		//remember what view we should use to store data changes, if needed
 //		if (temp->queryChangedInPreviousView)
@@ -131,7 +131,7 @@ tristate KexiQueryView::afterSwitchFrom(int mode)
 
 KexiDB::SchemaData* KexiQueryView::storeNewData(const KexiDB::SchemaData& sdata, bool &cancel)
 {
-	KexiViewBase * view = tqparentDialog()->viewThatRecentlySetDirtyFlag();
+	KexiViewBase * view = parentDialog()->viewThatRecentlySetDirtyFlag();
 	if (dynamic_cast<KexiQueryDesignerGuiEditor*>(view))
 		return dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeNewData(sdata, cancel);
 	if (dynamic_cast<KexiQueryDesignerSQLView*>(view))
@@ -141,7 +141,7 @@ KexiDB::SchemaData* KexiQueryView::storeNewData(const KexiDB::SchemaData& sdata,
 
 tristate KexiQueryView::storeData(bool dontAsk)
 {
-	KexiViewBase * view = tqparentDialog()->viewThatRecentlySetDirtyFlag();
+	KexiViewBase * view = parentDialog()->viewThatRecentlySetDirtyFlag();
 	if (dynamic_cast<KexiQueryDesignerGuiEditor*>(view))
 		return dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeData(dontAsk);
 	if (dynamic_cast<KexiQueryDesignerSQLView*>(view))
diff --git a/kexi/plugins/reports/kexireportfactory.h b/kexi/plugins/reports/kexireportfactory.h
index ab2ce7a1..1813fce7 100644
--- a/kexi/plugins/reports/kexireportfactory.h
+++ b/kexi/plugins/reports/kexireportfactory.h
@@ -42,7 +42,7 @@ class KexiReportFactory : public KFormDesigner::WidgetFactory
 		virtual bool previewWidget(const TQCString &, TQWidget *, KFormDesigner::Container *);
 
 		//virtual void		saveSpecialProperty(const TQString &classname, const TQString &name, const TQVariant &value, TQWidget *w,
-		         //TQDomElement &tqparentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
 		//virtual void            readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item) {}
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
 
diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp
index 11c49c84..4e04beae 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -121,10 +121,10 @@ void
 KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.begin(this, true);
@@ -144,7 +144,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports/kexireportview.cpp
index 913a493e..403c0277 100644
--- a/kexi/plugins/reports/kexireportview.cpp
+++ b/kexi/plugins/reports/kexireportview.cpp
@@ -187,7 +187,7 @@ KexiReportView::initForm()
 
 	// Show the form wizard if this is a new Form
 //	KexiDB::FieldList *fields = 0;
-	if(tqparentDialog()->id() < 0)
+	if(parentDialog()->id() < 0)
 	{
 #ifndef NO_DSWIZARD
 		KexiDataSourceWizard *w = new KexiDataSourceWizard(mainWin(), (TQWidget*)mainWin(), "datasource_wizard");
@@ -220,7 +220,7 @@ KexiReportView::loadForm()
 
 //@todo also load m_resizeMode !
 
-	kexipluginsdbg << "KexiReportForm::loadForm() Loading the form with id : " << tqparentDialog()->id() << endl;
+	kexipluginsdbg << "KexiReportForm::loadForm() Loading the form with id : " << parentDialog()->id() << endl;
 	// If we are previewing the Form, use the tempData instead of the form stored in the db
 	if(viewMode()==Kexi::DataViewMode && !tempData()->tempForm.isNull() ) {
 		KFormDesigner::FormIO::loadFormFromString(form(), m_reportform, tempData()->tempForm);
@@ -322,7 +322,7 @@ tristate
 KexiReportView::storeData(bool dontAsk)
 {
 	Q_UNUSED(dontAsk)
-	kexipluginsdbg << "KexiReportForm::storeData(): " << tqparentDialog()->partItem()->name() << " [" << tqparentDialog()->id() << "]" << endl;
+	kexipluginsdbg << "KexiReportForm::storeData(): " << parentDialog()->partItem()->name() << " [" << parentDialog()->id() << "]" << endl;
 	TQString data;
 	KFormDesigner::FormIO::saveFormToString(tempData()->form, data);
 	if (!storeDataBlock(data))
diff --git a/kexi/plugins/reports/kexireportview.h b/kexi/plugins/reports/kexireportview.h
index 02b4b48a..2b88c181 100644
--- a/kexi/plugins/reports/kexireportview.h
+++ b/kexi/plugins/reports/kexireportview.h
@@ -107,7 +107,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportView : public KexiViewBase
 		virtual tristate storeData(bool dontAsk = false);
 
 		KexiReportPart::TempData* tempData() const {
-			return static_cast<KexiReportPart::TempData*>(tqparentDialog()->tempData()); }
+			return static_cast<KexiReportPart::TempData*>(parentDialog()->tempData()); }
 		KexiReportPart* reportPart() const { return static_cast<KexiReportPart*>(part()); }
 
 		void disableWidgetActions();
diff --git a/kexi/plugins/reports/reportwidgets.cpp b/kexi/plugins/reports/reportwidgets.cpp
index 393beaad..c3ca65e4 100644
--- a/kexi/plugins/reports/reportwidgets.cpp
+++ b/kexi/plugins/reports/reportwidgets.cpp
@@ -145,16 +145,16 @@ KexiSubReport::setReportName(const TQString &name)
 		return;
 
 	// we need a KexiReportView*
-	TQWidget *w = tqparentWidget();
+	TQWidget *w = parentWidget();
 	while(w && !w->isA("KexiReportView"))
-		w = w->tqparentWidget();
+		w = w->parentWidget();
 	KexiReportView *view = (KexiReportView*)w;
 	if(!view)
 		return;
 
 	// we check if there is a form with this name
 	int id = KexiDB::idForObjectName(*(view->connection()), name, KexiPart::ReportObjectType);
-	if((id == 0) || (id == view->tqparentDialog()->id())) // == our form
+	if((id == 0) || (id == view->parentDialog()->id())) // == our form
 		return; // because of recursion when loading
 
 	// we create the container widget
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index 0c95cb0e..39f84599 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -295,7 +295,7 @@ KexiDB::SchemaData* KexiScriptDesignView::storeNewData(const KexiDB::SchemaData&
     if(! storeData()) {
         kdWarning() << "KexiScriptDesignView::storeNewData Failed to store the data." << endl;
         //failure: remove object's schema data to avoid garbage
-        KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+        KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
         conn->removeObject( s->id() );
         delete s;
         return 0;
@@ -306,7 +306,7 @@ KexiDB::SchemaData* KexiScriptDesignView::storeNewData(const KexiDB::SchemaData&
 
 tristate KexiScriptDesignView::storeData(bool /*dontAsk*/)
 {
-    kexipluginsdbg << "KexiScriptDesignView::storeData(): " << tqparentDialog()->partItem()->name() << " [" << tqparentDialog()->id() << "]" << endl;
+    kexipluginsdbg << "KexiScriptDesignView::storeData(): " << parentDialog()->partItem()->name() << " [" << parentDialog()->id() << "]" << endl;
 
     TQDomDocument domdoc("script");
     TQDomElement scriptelem = domdoc.createElement("script");
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index 3a2734aa..43fa7e25 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -238,19 +238,19 @@ def runGuiApp(copycenter, name):
 			f.close()
 			print "File \%s\" successfully written." % filename
 
-		def addItem(self, pluginimpl, afteritem = None, tqparentitem = None):
+		def addItem(self, pluginimpl, afteritem = None, parentitem = None):
 			#print "CopyJobWidget.addItem"
 			class ListViewItem(qt.QListViewItem):
-				def __init__(self, pluginimpl, listview, tqparentitem = None, afteritem = None):
+				def __init__(self, pluginimpl, listview, parentitem = None, afteritem = None):
 					self.pluginimpl = pluginimpl
-					if tqparentitem == None:
+					if parentitem == None:
 						qt.QListViewItem.__init__(self,listview)
 						self.setOpen(True)
 					else:
 						if afteritem == None:
-							qt.QListViewItem.__init__(self,tqparentitem)
+							qt.QListViewItem.__init__(self,parentitem)
 						else:
-							qt.QListViewItem.__init__(self,tqparentitem,afteritem)
+							qt.QListViewItem.__init__(self,parentitem,afteritem)
 						self.setRenameEnabled(1,True)
 				def startRename(self, columnindex):
 					qt.QListViewItem.startRename(self,columnindex)
@@ -274,7 +274,7 @@ def runGuiApp(copycenter, name):
 						if qt.QListViewItem.text(self,0).tqcontains("password"):
 							return "*" * len(str(qt.QListViewItem.text(self,1)))
 					return qt.QListViewItem.text(self,columnindex)
-			return ListViewItem(pluginimpl, self.listview, tqparentitem, afteritem)
+			return ListViewItem(pluginimpl, self.listview, parentitem, afteritem)
 
 		def updateItem(self,pluginname,pluginimpl):
 			#print "CopyJobWidget.updateItem"
diff --git a/kexi/plugins/tables/kexitabledesigner_dataview.cpp b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
index 2b0b3608..e1b8ddb9 100644
--- a/kexi/plugins/tables/kexitabledesigner_dataview.cpp
+++ b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
@@ -73,7 +73,7 @@ tristate KexiTableDesigner_DataView::afterSwitchFrom(int mode)
 
 KexiTablePart::TempData* KexiTableDesigner_DataView::tempData() const
 {
-	return static_cast<KexiTablePart::TempData*>(tqparentDialog()->tempData());
+	return static_cast<KexiTablePart::TempData*>(parentDialog()->tempData());
 }
 
 #include "kexitabledesigner_dataview.moc"
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index a612453a..2f6cd21c 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -588,13 +588,13 @@ tristate KexiTableDesignerView::beforeSwitchTo(int mode, bool &dontStore)
 	else */
 	tristate res = true;
 	if (mode==Kexi::DataViewMode) {
-		if (!dirty() && tqparentDialog()->neverSaved()) {
+		if (!dirty() && parentDialog()->neverSaved()) {
 			KMessageBox::sorry(this, i18n("Cannot switch to data view, because table design is empty.\n"
 				"First, please create your design.") );
 			return cancelled;
 		}
 //<temporary>
-		else if (dirty() && !tqparentDialog()->neverSaved()) {
+		else if (dirty() && !parentDialog()->neverSaved()) {
 //			cancelled = (KMessageBox::No == KMessageBox::questionYesNo(this, i18n("Saving changes for existing table design is not yet supported.\nDo you want to discard your changes now?")));
 
 //			KexiDB::Connection *conn = mainWin()->project()->dbConnection();
@@ -1406,7 +1406,7 @@ KexiDB::SchemaData* KexiTableDesignerView::storeNewData(const KexiDB::SchemaData
 		KexiDB::Connection *conn = mainWin()->project()->dbConnection();
 		res = conn->createTable(tempData()->table);
 		if (res!=true)
-			tqparentDialog()->settqStatus(conn, "");
+			parentDialog()->settqStatus(conn, "");
 	}
 
 	if (res == true) {
@@ -1489,7 +1489,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 
 			res = conn->alterTable(*tempData()->table, *newTable);
 			if (res != true)
-				tqparentDialog()->settqStatus(conn, "");
+				parentDialog()->settqStatus(conn, "");
 		}
 		else {
 			KexiDB::AlterTableHandler::ExecutionArguments args;
@@ -1499,7 +1499,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 				<< res.toString() << endl;
 			if (true != res) {
 				alterTableHandler->debugError();
-				tqparentDialog()->settqStatus(alterTableHandler, "");
+				parentDialog()->settqStatus(alterTableHandler, "");
 			}
 		}
 	}
@@ -1521,7 +1521,7 @@ tristate KexiTableDesignerView::simulateAlterTableExecution(TQString *debugTarge
 {
 #ifndef KEXI_NO_UNDOREDO_ALTERTABLE
 # ifdef KEXI_DEBUG_GUI
-	if (mainWin()->activeWindow() != tqparentDialog()) //to avoid executing for multiple alter table views
+	if (mainWin()->activeWindow() != parentDialog()) //to avoid executing for multiple alter table views
 		return false;
 	if (!tempData()->table || !m_dialog->schemaData())
 		return false;
@@ -1566,7 +1566,7 @@ tristate KexiTableDesignerView::executeRealAlterTable()
 
 KexiTablePart::TempData* KexiTableDesignerView::tempData() const
 {
-	return static_cast<KexiTablePart::TempData*>(tqparentDialog()->tempData());
+	return static_cast<KexiTablePart::TempData*>(parentDialog()->tempData());
 }
 
 /*void KexiTableDesignerView::slotAboutToUpdateRow(
@@ -1910,10 +1910,10 @@ void KexiTableDesignerView::propertySetSwitched()
 {
 	KexiDataTable::propertySetSwitched();
 
-	//if (tqparentDialog()!=tqparentDialog()->mainWin()->currentDialog())
+	//if (parentDialog()!=parentDialog()->mainWin()->currentDialog())
 	//	return; //this is not the current dialog's view
 	
-	static_cast<KexiTablePart*>(tqparentDialog()->part())->lookupColumnPage()
+	static_cast<KexiTablePart*>(parentDialog()->part())->lookupColumnPage()
 		->assignPropertySet(propertySet());
 }
 
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index cf98b683..c546327b 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -277,7 +277,7 @@ TQString KexiTableDesignerViewPrivate::messageForSavingChanges(bool &emptyTable,
 	return i18n("Do you want to save the design now?")
 	+ ( (emptyTable || skipWarning) ? TQString() :
 		(TQString("\n\n") + designerView->part()->i18nMessage(":additional message before saving design", 
-		designerView->tqparentDialog())) );
+		designerView->parentDialog())) );
 }
 
 void KexiTableDesignerViewPrivate::updateIconForItem(KexiTableItem &item, KoProperty::Set& set)