4 files changed, 10 insertions, 10 deletions

diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index f977a962..f194908f 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -211,7 +211,7 @@ void KexiDBComboBox::createEditor()
 void KexiDBComboBox::setLabelPosition(LabelPosition position)
 {
 	if(m_subwidget) {
-		if (-1 != m_subwidget->tqmetaObject()->tqfindProperty("frameShape", true))
+		if (-1 != m_subwidget->tqmetaObject()->findProperty("frameShape", true))
 			m_subwidget->setProperty("frameShape", TQVariant((int)TQFrame::NoFrame));
 		m_subwidget->setGeometry( editorGeometry() );
 	}
@@ -247,7 +247,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e)
 		return;
     }*/
 
-	if ( /*count() &&*/ ( !isEditable() || buttonGeometry().tqcontains( e->pos() ) ) ) {
+	if ( /*count() &&*/ ( !isEditable() || buttonGeometry().contains( e->pos() ) ) ) {
 		d->buttonPressed = false;
 
 /*	if ( d->usingListBox() ) {
@@ -256,7 +256,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e)
 	    listBox()->setCurrentItem(d->current);
 	    listBox()->blockSignals( FALSE );
 	    popup();
-	    if ( arrowRect.tqcontains( e->pos() ) ) {
+	    if ( arrowRect.contains( e->pos() ) ) {
 		d->arrowPressed = TRUE;
 		d->arrowDown    = TRUE;
 		tqrepaint( FALSE );
@@ -339,7 +339,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e )
 		}
 		else if (e->type()==TQEvent::Enter) {
 			if (!d->isEditable 
-				|| /*over button if editable combo*/buttonGeometry().tqcontains( TQT_TQMOUSEEVENT(e)->pos() )) 
+				|| /*over button if editable combo*/buttonGeometry().contains( TQT_TQMOUSEEVENT(e)->pos() )) 
 			{
 				d->mouseOver = true;
 				update();
@@ -347,7 +347,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e )
 		}
 		else if (e->type()==TQEvent::MouseMove) {
 			if (d->isEditable) {
-				const bool overButton = buttonGeometry().tqcontains( TQT_TQMOUSEEVENT(e)->pos() );
+				const bool overButton = buttonGeometry().contains( TQT_TQMOUSEEVENT(e)->pos() );
 				if (overButton != d->mouseOver) {
 					d->mouseOver = overButton;
 					update();
@@ -370,7 +370,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e )
 			}
 		}
 	}
-	else if (!d->isEditable && d->subWidgetsWithDisabledEvents && d->subWidgetsWithDisabledEvents->tqfind(o)) {
+	else if (!d->isEditable && d->subWidgetsWithDisabledEvents && d->subWidgetsWithDisabledEvents->find(o)) {
 		if (e->type()==TQEvent::MouseButtonPress) {
 			// clicking the subwidget should mean the same as clicking the combo box (i.e. show the popup)
 			if (handleMousePressEvent(TQT_TQMOUSEEVENT(e)))
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index cca955e5..c2a705c0 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -66,7 +66,7 @@ class KexiDBForm::Private
 		int indexOfDataItem( KexiDataItemInterface* item ) const
 		{
 			TQMapConstIterator<KexiDataItemInterface*, uint> indicesForDataAwareWidgetsIt(
-				indicesForDataAwareWidgets.tqfind(item));
+				indicesForDataAwareWidgets.find(item));
 			if (indicesForDataAwareWidgetsIt == indicesForDataAwareWidgets.constEnd())
 				return -1;
 			kexipluginsdbg << "KexiDBForm: column # for item: "
@@ -342,7 +342,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 //	/*! @todo d->indicesForDataAwareWidgets SHOULDNT BE UPDATED HERE BECAUSE
 //	THERE CAN BE ALSO NON-TABSTOP DATA WIDGETS!
 //	*/
-				d->indicesForDataAwareWidgets.tqreplace( 
+				d->indicesForDataAwareWidgets.replace( 
 					dataItem, 
 					numberOfDataAwareWidgets );
 				numberOfDataAwareWidgets++;
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index af539e3d..8226d3c4 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -482,7 +482,7 @@ void KexiDBLabel::paintEvent( TQPaintEvent* e )
 		the shadow has to be drawn using an offset relative to
 		the widgets border.
 		*/
-		if ( !d->pixmapDirty && e->rect().tqcontains( d->shadowPosition ) && !d->shadowPixmap.isNull()) {
+		if ( !d->pixmapDirty && e->rect().contains( d->shadowPosition ) && !d->shadowPixmap.isNull()) {
 			TQRect clipRect = TQRect(
 				TQMAX( e->rect().x() - d->shadowPosition.x(), 0 ),
 				TQMAX( e->rect().y() - d->shadowPosition.y(), 0 ),
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 6fcd851a..283631c3 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp
@@ -79,7 +79,7 @@ KexiDBSubForm::setFormName(const TQString &name)
 	TQStringList list;
 	while(pw) {
 		if(pw->isA("KexiDBSubForm")) {
-			if(list.tqcontains(pw->name())) {
+			if(list.contains(pw->name())) {
 //! @todo error message
 				return; // Be sure to don't run into a endless-loop cause of recursive subforms.
 			}