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

11 files changed, 24 insertions, 24 deletions

diff --git a/kexi/widget/tableview/kexicelleditorfactory.cpp b/kexi/widget/tableview/kexicelleditorfactory.cpp
index e0e9ec03..a2c79a88 100644
--- a/kexi/widget/tableview/kexicelleditorfactory.cpp
+++ b/kexi/widget/tableview/kexicelleditorfactory.cpp
@@ -176,7 +176,7 @@ KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column,
 		KexiDB::IndexSchema::ListIterator it = table->indicesIterator();
 		for (;it.current();++it) {
 			KexiDB::IndexSchema *idx = it.current();
-			if (idx->fields()->tqfindRef(&f)!=-1) {
+			if (idx->fields()->findRef(&f)!=-1) {
 				//find details-side rel. for this index
 				KexiDB::Relationship *rel = idx->detailsRelationships()->first();
 				if (rel) {
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 4695dbf8..8b803746 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -352,7 +352,7 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e )
 			+ TQPoint(m_scrollView->childX(d->button), m_scrollView->childY(d->button));
 		TQRect r(d->button->mapToGlobal(d->button->tqgeometry().topLeft()), 
 			d->button->mapToGlobal(d->button->tqgeometry().bottomRight()));
-		if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.tqcontains( gp )) {
+		if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) {
 			m_mouseBtnPressedWhenPopupVisible = true;
 		}
 	}
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index 95ed31c0..79613d9d 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -306,7 +306,7 @@ bool KexiDataAwareObjectInterface::sort()
 			return true;
 	}
 	if (m_currentItem != m_insertItem) {
-		m_curRow = m_data->tqfindRef(m_currentItem);
+		m_curRow = m_data->findRef(m_currentItem);
 		int jump = m_curRow - oldRow;
 		if (jump<0)
 			(*m_itemIterator) -= -jump;
@@ -1283,7 +1283,7 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row)
 
 void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool tqrepaint)
 {
-	int row = m_data->tqfindRef(item);
+	int row = m_data->findRef(item);
 	slotRowInserted( item, row, tqrepaint );
 }
 
@@ -1493,7 +1493,7 @@ void KexiDataAwareObjectInterface::slotAboutToDeleteRow(KexiTableItem& item,
 	KexiDB::ResultInfo* /*result*/, bool tqrepaint)
 {
 	if (tqrepaint) {
-		m_rowWillBeDeleted = m_data->tqfindRef(&item);
+		m_rowWillBeDeleted = m_data->findRef(&item);
 	}
 }
 
@@ -1888,7 +1888,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c
 			if (wholeWordsOnly) {
 				const int whereLength = where.length();
 				while (true) {
-					pos = where.tqfind( stringValue, pos, caseSensitive );
+					pos = where.find( stringValue, pos, caseSensitive );
 					if (pos == -1)
 						break;
 					if ((pos > 0 && where.at(pos-1).isLetterOrNumber())
@@ -1902,7 +1902,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c
 				firstCharacter = pos;
 			}
 			else {// !wholeWordsOnly
-				firstCharacter = where.tqfind( stringValue, pos, caseSensitive );
+				firstCharacter = where.find( stringValue, pos, caseSensitive );
 			}
 			return firstCharacter != -1;
 		}
@@ -1915,7 +1915,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c
 			if (wholeWordsOnly) {
 				const int whereLength = where.length();
 				while (true) {
-					pos = where.tqfindRev( stringValue, pos, caseSensitive );
+					pos = where.findRev( stringValue, pos, caseSensitive );
 					if (pos == -1)
 						break;
 					if ((pos > 0 && where.at(pos-1).isLetterOrNumber())
@@ -1932,7 +1932,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c
 				firstCharacter = pos;
 			}
 			else {// !wholeWordsOnly
-				firstCharacter = where.tqfindRev( stringValue, pos, caseSensitive );
+				firstCharacter = where.findRev( stringValue, pos, caseSensitive );
 			}
 			return firstCharacter != -1;
 		}
@@ -1962,7 +1962,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c
 	return false;
 }
 
-tristate KexiDataAwareObjectInterface::tqfind(const TQVariant& valueToFind, 
+tristate KexiDataAwareObjectInterface::find(const TQVariant& valueToFind, 
 	const KexiSearchAndReplaceViewInterface::Options& options, bool next)
 {
 	if (!hasData())
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index 3ac196fb..389c1c74 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -490,7 +490,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 
 		 \return true if value has been found, false if value has not been found,
 		 and cancelled if there is nothing to find or there is no data to search in. */
-		virtual tristate tqfind(const TQVariant& valueToFind, 
+		virtual tristate find(const TQVariant& valueToFind, 
 			const KexiSearchAndReplaceViewInterface::Options& options, bool next);
 
 		/*! Finds \a valueToFind within the data items and replaces with \a replacement
@@ -705,7 +705,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		 This is per-interface global cache. 
 		 Needed for faster lookup because there could be lookup values. 
 		 Called whenever columns definition changes, i.e. in setData() and clearColumns().
-		 @see tqfind() */
+		 @see find() */
 		void updateIndicesForVisibleValues();
 
 		//! data structure displayed for this object
@@ -856,7 +856,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 			bool exists : 1;
 		};
 
-		/*! Used to mark recently found value. Updated on succesful execution of tqfind().
+		/*! Used to mark recently found value. Updated on succesful execution of find().
 		 If the current cursor's position changes, or data in the current cell changes, 
 		 positionOfRecentlyFoundValue.exists is set to false. */
 		PositionOfValue m_positionOfRecentlyFoundValue;
@@ -867,7 +867,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		/*! Used to compare whether the search direction has changed. */
 		KexiSearchAndReplaceViewInterface::Options::SearchDirection m_recentSearchDirection;
 
-		//! Setup by updateIndicesForVisibleValues() and used by tqfind()
+		//! Setup by updateIndicesForVisibleValues() and used by find()
 		TQValueVector<uint> m_indicesForVisibleValues;
 };
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 7d49ec52..5668fbfd 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -238,7 +238,7 @@ KoProperty::Set* KexiDataAwarePropertySet::findPropertySetForItem(KexiTableItem&
 {
 	if (m_currentTVData.isNull())
 		return 0;
-	int idx = m_currentTVData->tqfindRef(&item);
+	int idx = m_currentTVData->findRef(&item);
 	if (idx<0)
 		return 0;
 	return m_sets[idx];
@@ -249,7 +249,7 @@ int KexiDataAwarePropertySet::findRowForPropertyValue(const TQCString& propertyN
 	const int size = m_sets.size();
 	for (int i=0; i<size; i++) {
 		KoProperty::Set *set = m_sets[i];
-		if (!set || !set->tqcontains(propertyName))
+		if (!set || !set->contains(propertyName))
 			continue;
 		if (set->property(propertyName).value() == value)
 			return i;
diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp
index af71ae4c..a0b5185e 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -105,7 +105,7 @@ void KexiDateTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria
 
 bool KexiDateTableEdit::valueIsNull()
 {
-//	if (m_lineedit->text().tqreplace(m_formatter.separator(),"").stripWhiteSpace().isEmpty())
+//	if (m_lineedit->text().replace(m_formatter.separator(),"").stripWhiteSpace().isEmpty())
 	if (m_formatter.isEmpty(m_lineedit->text())) //empty date is null
 		return true;
 	return dateValue().isNull();
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 26a3ed7f..575ae1e6 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -280,7 +280,7 @@ TQVariant KexiInputTableEdit::value()
 		//! js @todo PRESERVE PRECISION!
 		TQString txt = m_lineedit->text();
 		if (m_decsym!=".")
-			txt = txt.tqreplace(m_decsym,".");//convert back
+			txt = txt.replace(m_decsym,".");//convert back
 		bool ok;
 		const double result = txt.toDouble(&ok);
 		return ok ? TQVariant(result) : TQVariant();
diff --git a/kexi/widget/tableview/kexitableedit.h b/kexi/widget/tableview/kexitableedit.h
index 1d9378b0..ef618178 100644
--- a/kexi/widget/tableview/kexitableedit.h
+++ b/kexi/widget/tableview/kexitableedit.h
@@ -120,12 +120,12 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
 			int align, int x, int y_offset, int w, int h, const TQColor& fillColor,
 			const TQFontMetrics &fm, bool readOnly, bool fullRowSelection );
 
-		/*! Sometimes, editor can contain non-standard margin, for example combobox editor tqcontains
+		/*! Sometimes, editor can contain non-standard margin, for example combobox editor contains
 		 dropdown button at the right side. \return left margin's size; 
 		 0 by default. For reimplementation.  */
 		int leftMargin() const { return m_leftMargin; }
 
-		/*! Sometimes, editor can contain non-standard margin, for example combobox editor tqcontains
+		/*! Sometimes, editor can contain non-standard margin, for example combobox editor contains
 		 dropdown button at the right side. THe dropdown button's width is counted only if \a focused is true.
 		 \return right margin's size; 0 by default. For reimplementation.  */
 		int rightMargin(bool focused) const;
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 9fc319ff..d164f68a 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -1037,7 +1037,7 @@ void KexiTableView::contentsMousePressEvent( TQMouseEvent* e )
 			s = TQMIN( columnWidth(m_curCol)-3, s ); //avoid too large box
 			const TQRect r( columnPos(m_curCol) + TQMAX( columnWidth(m_curCol)/2 - s/2, 0 ), rowPos(m_curRow) +d->rowHeight/2 - s/2 /*- 1*/, s, s);
 			//kexidbg << r << endl;
-			if (r.tqcontains(e->pos())) {
+			if (r.contains(e->pos())) {
 //				kexidbg << "e->x:" << e->x() << " e->y:" << e->y() << " " << rowPos(m_curRow) << 
 //					" " << columnPos(m_curCol) << endl;
 				boolToggled();
@@ -2040,7 +2040,7 @@ void KexiTableView::removeEditor()
 
 void KexiTableView::slotRowRepaintRequested(KexiTableItem& item)
 {
-	updateRow( m_data->tqfindRef(&item) );
+	updateRow( m_data->findRef(&item) );
 }
 
 //(js) unused
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index b22d619d..dec81f95 100644
--- a/kexi/widget/tableview/kexitableviewdata.h
+++ b/kexi/widget/tableview/kexitableviewdata.h
@@ -408,7 +408,7 @@ public:
 	inline bool isEmpty () const { return KexiTableViewDataBase::isEmpty(); }
 	inline KexiTableItem* first() { return KexiTableViewDataBase::first(); }
 	inline KexiTableItem* last() { return KexiTableViewDataBase::last(); }
-	inline int tqfindRef( const KexiTableItem* item ) { return KexiTableViewDataBase::tqfindRef(item); }
+	inline int findRef( const KexiTableItem* item ) { return KexiTableViewDataBase::findRef(item); }
 	inline void sort() { KexiTableViewDataBase::sort(); }
 	inline bool removeFirst() { return KexiTableViewDataBase::removeFirst(); }
 	inline bool removeLast() { return KexiTableViewDataBase::removeLast(); }
diff --git a/kexi/widget/tableview/kexitextformatter.cpp b/kexi/widget/tableview/kexitextformatter.cpp
index b7388138..6045620a 100644
--- a/kexi/widget/tableview/kexitextformatter.cpp
+++ b/kexi/widget/tableview/kexitextformatter.cpp
@@ -168,7 +168,7 @@ TQVariant KexiTextFormatter::textToValue(const TQString& text) const
 	case KexiDB::Field::Double: {
 		// replace custom decimal symbol with '.' as required by to{Float|Double}()
 		TQString fixedText( text );
-		fixedText.tqreplace(KGlobal::locale()->decimalSymbol(), ".");
+		fixedText.replace(KGlobal::locale()->decimalSymbol(), ".");
 		if (t == KexiDB::Field::Double)
 			return fixedText.toDouble();
 		return fixedText.toFloat();