rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

13 files changed, 41 insertions, 41 deletions

diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 31ab61d0..9318bb5e 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -142,7 +142,7 @@ void KActionsListViewBase::init()
 		if (!isActionVisible((*it)->name(), actionCategories))
 			continue;
 		ActionSelectorDialogListItem *pitem = new ActionSelectorDialogListItem((*it)->name(), 
-			this, (*it)->toolTip().isEmpty() ? (*it)->text().tqreplace("&", "") : (*it)->toolTip() );
+			this, (*it)->toolTip().isEmpty() ? (*it)->text().replace("&", "") : (*it)->toolTip() );
 		pitem->fifoSorting = false; //alpha sort
 		pitem->setPixmap( 0, (*it)->iconSet( KIcon::Small, 16 ).pixmap( TQIconSet::Small, TQIconSet::Active ) );
 		if (!pitem->pixmap(0) || pitem->pixmap(0)->isNull())
@@ -278,7 +278,7 @@ class ActionToExecuteListView : public ActionsListViewBase
 				printItem->setPixmap(0, SmallIcon("fileprint"));
 				KAction *a = KStdAction::printPreview(0, 0, 0);
 				item = new ActionSelectorDialogListItem("printPreview", printItem, 
-					a->text().tqreplace("&", "").tqreplace("...", ""));
+					a->text().replace("&", "").replace("...", ""));
 				item->setPixmap(0, SmallIcon(a->icon()));
 				delete a;
 				item = new ActionSelectorDialogListItem("pageSetup", printItem, i18n("Show Page Setup"));
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 3e1e5c4b..7e5b9b85 100644
--- a/kexi/plugins/forms/kexidataprovider.cpp
+++ b/kexi/plugins/forms/kexidataprovider.cpp
@@ -81,7 +81,7 @@ void KexiFormDataProvider::setMainDataSourceWidget(TQWidget* mainWidget)
 		kexipluginsdbg << obj->name() << endl;
 		m_dataItems.append( formDataItem );
 		formDataItem->installListener( this );
-		tmpSources.tqreplace( dataSource, (char*)1 );
+		tmpSources.replace( dataSource, (char*)1 );
 	}
 	delete l;
 	//now we've got a set (unique list) of field names in tmpSources
@@ -145,7 +145,7 @@ void KexiFormDataProvider::fillDuplicatedDataItems(
 			if (!it.current()->columnInfo() || !it.current()->columnInfo()->field)
 				continue;
 			kdDebug() << " ** " << it.current()->columnInfo()->field->name() << endl;
-			it_dup = tmpDuplicatedItems.tqfind( it.current()->columnInfo()->field );
+			it_dup = tmpDuplicatedItems.find( it.current()->columnInfo()->field );
 			uint count;
 			if (it_dup==tmpDuplicatedItems.end())
 				count = 0;
@@ -162,7 +162,7 @@ void KexiFormDataProvider::fillDuplicatedDataItems(
 			}
 		}
 	}
-	if (item->columnInfo() && m_duplicatedItems->tqfind( item->columnInfo()->field )) {
+	if (item->columnInfo() && m_duplicatedItems->find( item->columnInfo()->field )) {
 		for (TQPtrListIterator<KexiFormDataItemInterface> it(m_dataItems); it.current(); ++it) {
 			if (it.current()!=item && item->columnInfo()->field == it.current()->columnInfo()->field) {
 				kexipluginsdbg << "- setting a copy of value for item '" 
@@ -248,7 +248,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou
 		const int newIndex = newIndices.at( it.data(), &ok );
 		if (ok && newIndex!=-1) {
 			kexipluginsdbg << "invalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl;
-			newFieldNumbersForDataItems.tqreplace(it.key(), newIndex);
+			newFieldNumbersForDataItems.replace(it.key(), newIndex);
 		}
 		else {
 			kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl;
@@ -304,7 +304,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou
 				}
 			}
 		}
-		tmpUsedDataSources.tqreplace( item->dataSource().lower(), (char*)1 );
+		tmpUsedDataSources.replace( item->dataSource().lower(), (char*)1 );
 		++it;
 	}
 	m_disableFillDuplicatedDataItems = false;
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index ce11e7d9..74f9af05 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -357,26 +357,26 @@ void KexiDataSourcePage::setDataSource(const TQCString& mimeType, const TQCStrin
 void KexiDataSourcePage::assignPropertySet(KoProperty::Set* propertySet)
 {
 	TQCString objectName;
-	if (propertySet && propertySet->tqcontains("name"))
+	if (propertySet && propertySet->contains("name"))
 		objectName = (*propertySet)["name"].value().toCString();
 	if (!objectName.isEmpty() && objectName == m_currentObjectName)
 		return; //the same object
 	m_currentObjectName = objectName;
 
 	TQCString objectClassName;
-	if (propertySet && propertySet->tqcontains("this:className"))
+	if (propertySet && propertySet->contains("this:className"))
 		objectClassName = (*propertySet)["this:className"].value().toCString();
 /*moved	if (propertySet) {
 		TQCString iconName;
 		TQString objectClassString;
-		if (propertySet->tqcontains("this:iconName"))
+		if (propertySet->contains("this:iconName"))
 			iconName = (*propertySet)["this:iconName"].value().toCString();
-		if (propertySet->tqcontains("this:classString"))
+		if (propertySet->contains("this:classString"))
 			objectClassString = (*propertySet)["this:classString"].value().toString();
 		m_objectInfoLabel->setObjectName(objectName);
 		m_objectInfoLabel->setObjectClassIcon(iconName);
 		m_objectInfoLabel->setObjectClassName(objectClassString);
-		if (propertySet->tqcontains("this:className"))
+		if (propertySet->contains("this:className"))
 			objectClassName = (*propertySet)["this:className"].value().toCString();
 	}*/
 	KexiPropertyEditorView::updateInfoLabelForPropertySet(
@@ -396,7 +396,7 @@ void KexiDataSourcePage::assignPropertySet(KoProperty::Set* propertySet)
 //	else {
 
 	const bool multipleSelection = objectClassName=="special:multiple";
-	const bool hasDataSourceProperty = propertySet && propertySet->tqcontains("dataSource") && !multipleSelection;
+	const bool hasDataSourceProperty = propertySet && propertySet->contains("dataSource") && !multipleSelection;
 
 	if (!isForm) {
 		//this is a widget
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index de2d8570..cd6f5ac3 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -46,7 +46,7 @@ bool KexiFormEventAction::ActionData::isEmpty() const
 KexiPart::Info* KexiFormEventAction::ActionData::decodeString(
 	TQString& actionType, TQString& actionArg, bool& ok) const
 {
-	const int idx = string.tqfind(':');
+	const int idx = string.find(':');
 	ok = false;
 	if (idx==-1)
 		return 0;
diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp
index ce9b142b..3c76e7d9 100644
--- a/kexi/plugins/forms/kexiformmanager.cpp
+++ b/kexi/plugins/forms/kexiformmanager.cpp
@@ -120,10 +120,10 @@ void KexiFormManager::setFormDataSource(const TQCString& mime, const TQCString&
 	if (activeForm()->selectedWidget() == formWidget) {
 		//active form is selected: just use properties system
 		KFormDesigner::WidgetPropertySet *set = propertySet();
-		if (!set || !set->tqcontains("dataSource"))
+		if (!set || !set->contains("dataSource"))
 			return;
 		(*set)["dataSource"].setValue(name);
-		if (set->tqcontains("dataSourceMimeType"))
+		if (set->contains("dataSourceMimeType"))
 			(*set)["dataSourceMimeType"].setValue(mime);
 		return;
 	}
@@ -159,19 +159,19 @@ void KexiFormManager::setDataSourceFieldOrExpression(const TQString& string, con
 //		return;
 	
 	KFormDesigner::WidgetPropertySet *set = propertySet();
-	if (!set || !set->tqcontains("dataSource"))
+	if (!set || !set->contains("dataSource"))
 		return;
 
 	(*set)["dataSource"].setValue(string);
 
-	if (set->tqcontains("autoCaption") && (*set)["autoCaption"].value().toBool()) {
-		if (set->tqcontains("fieldCaptionInternal"))
+	if (set->contains("autoCaption") && (*set)["autoCaption"].value().toBool()) {
+		if (set->contains("fieldCaptionInternal"))
 			(*set)["fieldCaptionInternal"].setValue(caption);
 	}
 	if (//type!=KexiDB::Field::InvalidType && 
-		set->tqcontains("widgetType") && (*set)["widgetType"].value().toString()=="Auto")
+		set->contains("widgetType") && (*set)["widgetType"].value().toString()=="Auto")
 	{
-		if (set->tqcontains("fieldTypeInternal"))
+		if (set->contains("fieldTypeInternal"))
 			(*set)["fieldTypeInternal"].setValue(type);
 	}
 
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 3f1d3466..e03a0779 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -466,7 +466,7 @@ KexiFormPart::slotPropertyChanged(TQWidget *w, const TQCString &name, const TQVa
 	}
 	if (KFormDesigner::FormManager::self()->activeForm()->widget() && name == "geometry") {
 		//fall back to sizeInternal property....
-		if (KFormDesigner::FormManager::self()->propertySet()->tqcontains("sizeInternal"))
+		if (KFormDesigner::FormManager::self()->propertySet()->contains("sizeInternal"))
 			KFormDesigner::FormManager::self()->propertySet()->property("sizeInternal").setValue(TQSize(value.toRect().size()));
 	}
 }
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index 057e0a33..5996061f 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -394,7 +394,7 @@ int KexiFormScrollView::columns() const
 	KexiFormDataItemInterface *item = dynamic_cast<KexiFormDataItemInterface*>(dbFormWidget()->orderedDataAwareWidgets()->at( col ));
 	if (!item)
 		return -1;
-	KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.tqfind( item ));
+	KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.find( item ));
 	return it!=m_fieldNumbersForDataItems.constEnd() ? it.data() : -1;
 }*/
 
@@ -421,7 +421,7 @@ bool KexiFormScrollView::columnEditable(int col)
 	if (!item || item->isReadOnly())
 		return false;
 
-//	KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.tqfind( item ));
+//	KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.find( item ));
 //	return KexiDataAwareObjectInterface::columnEditable( it!=m_fieldNumbersForDataItems.constEnd() ? it.data() : -1 );
 	return KexiDataAwareObjectInterface::columnEditable( col );
 }
diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h
index cf2731d1..61c13a8f 100644
--- a/kexi/plugins/forms/kexiformscrollview.h
+++ b/kexi/plugins/forms/kexiformscrollview.h
@@ -79,7 +79,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView :
 				dbFormWidget()->orderedDataAwareWidgets()->at( col ));
 			if (!item)
 				return -1;
-			KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.tqfind( item ));
+			KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.find( item ));
 			return it!=m_fieldNumbersForDataItems.constEnd() ? (int)it.data() : -1;
 		}
 
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 3f30fff2..3b12588c 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -345,7 +345,7 @@ void KexiFormView::updateValuesForSubproperties()
 				kexipluginsdbg << "KexiFormView::loadForm(): delayed setting of the subproperty: widget="
 					<< it.current()->widget()->name() << " prop=" << subpropIt.key() << " val=" << subpropIt.data() << endl;
 
-				const int count = subwidget->tqmetaObject()->tqfindProperty(subpropIt.key().latin1(), true);
+				const int count = subwidget->tqmetaObject()->findProperty(subpropIt.key().latin1(), true);
 				const TQMetaProperty *meta = count!=-1 ? subwidget->tqmetaObject()->property(count, true) : 0;
 				if (meta) {
 					// Special case: the property value of type enum (set) but is saved as a string list,
@@ -371,7 +371,7 @@ void KexiFormView::updateValuesForSubproperties()
 static void setUnsavedBLOBIdsForDataViewMode( 
 	TQWidget* widget, const TQMap<TQCString, KexiBLOBBuffer::Id_t>& unsavedLocalBLOBsByName)
 {
-	if (-1 != widget->tqmetaObject()->tqfindProperty("pixmapId")) {
+	if (-1 != widget->tqmetaObject()->findProperty("pixmapId")) {
 		const KexiBLOBBuffer::Id_t blobID = unsavedLocalBLOBsByName[ widget->name() ];
 		if (blobID > 0)
 			widget->setProperty("pixmapId", (uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by TQVariant - will be fixed in TQt4*/)blobID);
@@ -783,7 +783,7 @@ KexiFormView::storeData(bool dontAsk)
 
 			TQString originalFileName(h.originalFileName());
 			TQFileInfo fi(originalFileName);
-			TQString caption(fi.baseName().tqreplace('_', " ").simplifyWhiteSpace());
+			TQString caption(fi.baseName().replace('_', " ").simplifyWhiteSpace());
 
 			if (st) {
 				*st /* << NO, (pgsql doesn't support this):TQVariant()*/ /*id*/ 
@@ -1044,9 +1044,9 @@ KexiFormView::updateDataSourcePage()
 	if (viewMode()==Kexi::DesignViewMode) {
 		TQCString dataSourceMimeType, dataSource;
 		KFormDesigner::WidgetPropertySet *set = KFormDesigner::FormManager::self()->propertySet();
-		if (set->tqcontains("dataSourceMimeType"))
+		if (set->contains("dataSourceMimeType"))
 			dataSourceMimeType = (*set)["dataSourceMimeType"].value().toCString();
-		if (set->tqcontains("dataSource"))
+		if (set->contains("dataSource"))
 			dataSource = (*set)["dataSource"].value().toCString();
 
 		formPart()->dataSourcePage()->setDataSource(dataSourceMimeType, dataSource);
@@ -1149,7 +1149,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 		group->addCommand(insertCmd, false/*don't exec twice*/);
 
 		KFormDesigner::ObjectTreeItem *newWidgetItem 
-			= form()->objectTree()->dict()->tqfind(insertCmd->widgetName());
+			= form()->objectTree()->dict()->find(insertCmd->widgetName());
 		KexiDBAutoField* newWidget 
 			= newWidgetItem ? dynamic_cast<KexiDBAutoField*>(newWidgetItem->widget()) : 0;
 		widgetsToSelect.append(newWidget);
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.
 			}