rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

7 files changed, 21 insertions, 21 deletions

diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp
index 17eecec..2846172 100644
--- a/kwallet/allyourbase.cpp
+++ b/kwallet/allyourbase.cpp
@@ -83,7 +83,7 @@ KWalletContainerItem* KWalletFolderItem::getContainer(KWallet::Wallet::EntryType
 	return 0;
 }
 
-bool KWalletFolderItem::tqcontains(const TQString& key) {
+bool KWalletFolderItem::contains(const TQString& key) {
 	return (getItem(key) != 0);
 }
 
@@ -138,7 +138,7 @@ KWallet::Wallet::EntryType KWalletContainerItem::type() {
 	return _type;
 }
 
-bool KWalletContainerItem::tqcontains(const TQString& key) {
+bool KWalletContainerItem::contains(const TQString& key) {
 	return getItem(key) != 0;
 }
 
@@ -668,7 +668,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueList<TQIconDragIt
 
 void KWalletIconView::contentsMousePressEvent(TQMouseEvent *e) {
 	_mousePos = e->pos();
-	if (!tqfindItem(_mousePos)) {
+	if (!findItem(_mousePos)) {
 		clearSelection();
 	}
 	KIconView::contentsMousePressEvent( e );
diff --git a/kwallet/allyourbase.h b/kwallet/allyourbase.h
index 7c37c10..17f92a5 100644
--- a/kwallet/allyourbase.h
+++ b/kwallet/allyourbase.h
@@ -64,7 +64,7 @@ class KWalletContainerItem : public KListViewItem {
 	public:
 		virtual int rtti() const;
 		KWallet::Wallet::EntryType type();
-		bool tqcontains(const TQString& itemKey);
+		bool contains(const TQString& itemKey);
 		TQListViewItem* getItem(const TQString& itemKey);
 
 	private:
@@ -84,7 +84,7 @@ class KWalletFolderItem : public KListViewItem {
 		void refresh();
 		KWalletContainerItem* getContainer(KWallet::Wallet::EntryType type);
 		TQPixmap getFolderIcon(KIcon::Group group);
-		bool tqcontains(const TQString& itemKey);
+		bool contains(const TQString& itemKey);
 		TQListViewItem* getItem(const TQString& itemKey);
 
 	public:
diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp
index a9ebb68..aeffa55 100644
--- a/kwallet/konfigurator/konfigurator.cpp
+++ b/kwallet/konfigurator/konfigurator.cpp
@@ -101,11 +101,11 @@ void KWalletConfig::updateWalletLists() {
 	_wcw->_localWallet->insertStringList(wl);
 	_wcw->_defaultWallet->insertStringList(wl);
 
-	if (wl.tqcontains(p1)) {
+	if (wl.contains(p1)) {
 		_wcw->_localWallet->setCurrentText(p1);
 	}
 
-	if (wl.tqcontains(p2)) {
+	if (wl.contains(p2)) {
 		_wcw->_defaultWallet->setCurrentText(p2);
 	}
 }
diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp
index 2a72870..5ab1f8f 100644
--- a/kwallet/kwalleteditor.cpp
+++ b/kwallet/kwalleteditor.cpp
@@ -230,7 +230,7 @@ void KWalletEditor::updateFolderList(bool checkEntries) {
 		if (!fi) {
 			continue;
 		}
-		if (!fl.tqcontains(fi->name())) {
+		if (!fl.contains(fi->name())) {
 			trash.push(i);
 		}
 	}
@@ -277,7 +277,7 @@ void KWalletEditor::updateFolderList(bool checkEntries) {
 	}
 
 	//check if the current folder has been removed
-	if (!fl.tqcontains(_currentFolder)) {
+	if (!fl.contains(_currentFolder)) {
 		_currentFolder = "";
 		_ww->_entryTitle->clear();
 		_ww->_iconTitle->clear();
@@ -478,7 +478,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 
 	// Remove deleted entries
 	for (TQListViewItem *i = pi->firstChild(); i; i = i->nextSibling()) {
-		if (!entries.tqcontains(i->text(0))) {
+		if (!entries.contains(i->text(0))) {
 			if (i == _entryList->currentItem()) {
 				entrySelectionChanged(0L);
 			}
@@ -487,7 +487,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 	}
 
 	for (TQListViewItem *i = mi->firstChild(); i; i = i->nextSibling()) {
-		if (!entries.tqcontains(i->text(0))) {
+		if (!entries.contains(i->text(0))) {
 			if (i == _entryList->currentItem()) {
 				entrySelectionChanged(0L);
 			}
@@ -496,7 +496,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 	}
 
 	for (TQListViewItem *i = bi->firstChild(); i; i = i->nextSibling()) {
-		if (!entries.tqcontains(i->text(0))) {
+		if (!entries.contains(i->text(0))) {
 			if (i == _entryList->currentItem()) {
 				entrySelectionChanged(0L);
 			}
@@ -505,7 +505,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 	}
 
 	for (TQListViewItem *i = ui->firstChild(); i; i = i->nextSibling()) {
-		if (!entries.tqcontains(i->text(0))) {
+		if (!entries.contains(i->text(0))) {
 			if (i == _entryList->currentItem()) {
 				entrySelectionChanged(0L);
 			}
@@ -518,7 +518,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 
 	// Add new entries
 	for (TQStringList::Iterator i = entries.begin(); i != entries.end(); ++i) {
-		if (fi->tqcontains(*i)){
+		if (fi->contains(*i)){
 			continue;
 		}
 
@@ -658,7 +658,7 @@ void KWalletEditor::newEntry() {
 		}
 
 		// FIXME: prohibits the use of the subheadings
-		if (fi->tqcontains(n)) {
+		if (fi->contains(n)) {
 			int rc = KMessageBox::questionYesNo(this, i18n("Sorry, that entry already exists. Try again?"), TQString(), i18n("Try Again"), i18n("Do Not Try"));
 			if (rc == KMessageBox::Yes) {
 				continue;
diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp
index 7ac86d2..9a85df8 100644
--- a/kwallet/kwalletmanager.cpp
+++ b/kwallet/kwalletmanager.cpp
@@ -185,7 +185,7 @@ TQStringList wl = KWallet::Wallet::walletList();
 TQPtrStack<TQIconViewItem> trash;
 
 	for (TQIconViewItem *item = _iconView->firstItem(); item; item = item->nextItem()) {
-		if (!wl.tqcontains(item->text())) {
+		if (!wl.contains(item->text())) {
 			trash.push(item);
 		}
 	}
@@ -194,7 +194,7 @@ TQPtrStack<TQIconViewItem> trash;
 	trash.clear();
 
 	for (TQStringList::Iterator i = wl.begin(); i != wl.end(); ++i) {
-		if (!_iconView->tqfindItem(*i)) {
+		if (!_iconView->findItem(*i)) {
 			// FIXME: if KWallet::Wallet::isOpen(*i) then show
 			//        a different icon!
 			new KWalletItem(_iconView, *i);
@@ -372,7 +372,7 @@ void KWalletManager::createWallet() {
 			return;
 		}
 
-		if (_iconView->tqfindItem(n)) {
+		if (_iconView->findItem(n)) {
 			int rc = KMessageBox::questionYesNo(this, i18n("Sorry, that wallet already exists. Try a new name?"), TQString(), i18n("Try New"), i18n("Do Not Try"));
 			if (rc == KMessageBox::Yes) {
 				continue;
diff --git a/kwallet/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp
index 3051e6c..302540e 100644
--- a/kwallet/kwmapeditor.cpp
+++ b/kwallet/kwmapeditor.cpp
@@ -168,10 +168,10 @@ class InlineEditor : public TQTextEdit {
 };
 
 
-TQWidget *KWMapEditor::beginEdit(int row, int col, bool tqreplace) {
+TQWidget *KWMapEditor::beginEdit(int row, int col, bool replace) {
 	//kdDebug(2300) << "EDIT COLUMN " << col << endl;
 	if (col != 2) {
-		return TQTable::beginEdit(row, col, tqreplace);
+		return TQTable::beginEdit(row, col, replace);
 	}
 
 	TQRect geo = cellGeometry(row, col);
diff --git a/kwallet/kwmapeditor.h b/kwallet/kwmapeditor.h
index 7d1fe44..3b434af 100644
--- a/kwallet/kwmapeditor.h
+++ b/kwallet/kwmapeditor.h
@@ -47,7 +47,7 @@ class KWMapEditor : public TQTable {
 		void copy();
 
 	protected:
-		virtual TQWidget *beginEdit(int row, int col, bool tqreplace);
+		virtual TQWidget *beginEdit(int row, int col, bool replace);
 
 	signals:
 		void dirty();