rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

9 files changed, 29 insertions, 29 deletions

diff --git a/kdm/kfrontend/kconsole.cpp b/kdm/kfrontend/kconsole.cpp
index 5bc159244..6c2ab09ab 100644
--- a/kdm/kfrontend/kconsole.cpp
+++ b/kdm/kfrontend/kconsole.cpp
@@ -163,7 +163,7 @@ KConsole::slotData()
 		           verticalScrollBar()->maxValue());
 		TQString str( TQString::fromLocal8Bit( buffer, n ).remove( '\r' ) );
 		int pos, opos;
-		for (opos = 0; (pos = str.tqfind( '\n', opos )) >= 0; opos = pos + 1) {
+		for (opos = 0; (pos = str.find( '\n', opos )) >= 0; opos = pos + 1) {
 			if (paragraphs() == 100)
 				removeParagraph( 0 );
 			if (!leftover.isEmpty()) {
diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp
index 9bcb589ca..9222f69ee 100644
--- a/kdm/kfrontend/kdmshutdown.cpp
+++ b/kdm/kfrontend/kdmshutdown.cpp
@@ -493,7 +493,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 		FlatButton* btnReboot = new FlatButton( lfrm );
 		btnReboot->setTextLabel( i18n("&Restart"), false );
 		btnReboot->setPixmap( DesktopIcon( "reload") );
-                int i = btnReboot->textLabel().tqfind( TQRegExp("\\&"), 0 );    // i == 1
+                int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
                 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
 		hbuttonbox->addWidget ( btnReboot);
 		connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
@@ -524,7 +524,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 		FlatButton* btnHalt = new FlatButton( lfrm );
 		btnHalt->setTextLabel( i18n("&Turn Off"), false );
 		btnHalt->setPixmap( DesktopIcon( "exit") );
-                i = btnHalt->textLabel().tqfind( TQRegExp("\\&"), 0 );    // i == 1
+                i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
                 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
 		hbuttonbox->addWidget ( btnHalt );
 		connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp
index e3d060643..9300b9220 100644
--- a/kdm/kfrontend/kgdialog.cpp
+++ b/kdm/kfrontend/kgdialog.cpp
@@ -133,7 +133,7 @@ KGDialog::inserten( const TQString& txt, int accel, TQPopupMenu *cmnu )
 void
 KGDialog::slotActivateMenu( int id )
 {
-	TQPopupMenu *cmnu = optMenu->tqfindItem( id )->popup();
+	TQPopupMenu *cmnu = optMenu->findItem( id )->popup();
 	TQSize sh( cmnu->tqsizeHint() / 2 );
 	cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
 }
diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
index 2e5da21a2..fd4f07d96 100644
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
@@ -207,7 +207,7 @@ void KGreeter::readFacesList()
         if ( line.isEmpty() )
             continue;
         TQString icon;
-        int index = line.tqfind( ' ' );
+        int index = line.find( ' ' );
         if ( index > 0 ) {
             icon = line.left( index );
             line = line.mid( index );
@@ -329,7 +329,7 @@ KGreeter::insertUser( const TQImage &default_pix,
             p = default_pix;
 
 	TQString realname = KStringHandler::from8Bit( ps->pw_gecos );
-	realname.truncate( realname.tqfind( ',' ) );
+	realname.truncate( realname.find( ',' ) );
 	if (realname.isEmpty() || realname == username)
 		new UserListViewItem( userView, username, TQPixmap( p ), username );
 	else {
@@ -343,7 +343,7 @@ KGreeter::insertUser( const TQImage &default_pix,
 
 class KCStringList : public TQValueList<TQCString> {
   public:
-	bool tqcontains( const char *str ) const
+	bool contains( const char *str ) const
 	{
 		for (ConstIterator it = begin(); it != end(); ++it)
 			if (*it == str)
@@ -355,9 +355,9 @@ class KCStringList : public TQValueList<TQCString> {
 class UserList {
   public:
 	UserList( char **in );
-	bool hasUser( const char *str ) const { return users.tqcontains( str ); }
+	bool hasUser( const char *str ) const { return users.contains( str ); }
 	bool hasGroup( gid_t gid ) const
-		{ return groups.tqfind( gid ) != groups.end(); }
+		{ return groups.find( gid ) != groups.end(); }
 	bool hasGroups() const { return !groups.isEmpty(); }
 	KCStringList users;
 
@@ -412,7 +412,7 @@ KGreeter::insertUsers(int limit_users)
 			    !noUsers.hasGroup( ps->pw_gid ))
 			{
 				TQString username( TQFile::decodeName( ps->pw_name ) );
-				if (!dupes.tqfind( username )) {
+				if (!dupes.find( username )) {
 					dupes.insert( username, (int *)-1 );
                                         toinsert.append( username );
 
@@ -443,7 +443,7 @@ KGreeter::insertUsers(int limit_users)
 // 			    !noUsers.hasGroup( ps->pw_gid ))
 //                         {
 //                             TQString username( TQFile::decodeName( ent->ut_user ) );
-//                             if (!dupes.tqfind( username )) {
+//                             if (!dupes.find( username )) {
 //                                 dupes.insert( username, (int *)-1 );
 //                                 toinsert.append( username );
 //                                 count++;
@@ -477,7 +477,7 @@ KGreeter::insertUsers(int limit_users)
 				     users.hasGroup( ps->pw_gid )))
 				{
 					TQString username( TQFile::decodeName( ps->pw_name ) );
-					if (!dupes.tqfind( username )) {
+					if (!dupes.find( username )) {
 						dupes.insert( username, (int *)-1 );
 						insertUser( default_pix, username, ps );
 					}
diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp
index 4748b3f62..337b45644 100644
--- a/kdm/kfrontend/kgverify.cpp
+++ b/kdm/kfrontend/kgverify.cpp
@@ -148,8 +148,8 @@ TQString // public
 KGVerify::pluginName() const
 {
 	TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() );
-	uint st = name.tqfindRev( '/' ) + 1;
-	uint en = name.tqfind( '.', st );
+	uint st = name.findRev( '/' ) + 1;
+	uint en = name.find( '.', st );
 	if (en - st > 7 && TQConstString( name.tqunicode() + st, 7 ).string() == "kgreet_")
 		st += 7;
 	return name.mid( st, en - st );
diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp
index 95768833e..67778711d 100644
--- a/kdm/kfrontend/themer/kdmitem.cpp
+++ b/kdm/kfrontend/themer/kdmitem.cpp
@@ -368,7 +368,7 @@ KdmItem::mouseEvent( int x, int y, bool pressed, bool released )
 	}
 
 	ItemState oldState = state;
-	if (area.tqcontains( x, y )) {
+	if (area.contains( x, y )) {
 		if (released && oldState == Sactive) {
 			if (buttonParent)
 				emit activated( id );
@@ -504,13 +504,13 @@ KdmItem::placementHint( const TQRect &parentRect )
 
 	// anchor the rect to an edge / corner
 	if (pos.anchor.length() > 0 && pos.anchor.length() < 3) {
-		if (pos.anchor.tqfind( 'n' ) >= 0)
+		if (pos.anchor.find( 'n' ) >= 0)
 			dy = 0;
-		if (pos.anchor.tqfind( 's' ) >= 0)
+		if (pos.anchor.find( 's' ) >= 0)
 			dy = -h;
-		if (pos.anchor.tqfind( 'w' ) >= 0)
+		if (pos.anchor.find( 'w' ) >= 0)
 			dx = 0;
-		if (pos.anchor.tqfind( 'e' ) >= 0)
+		if (pos.anchor.find( 'e' ) >= 0)
 			dx = -w;
 	}
 	// KdmItem *p = static_cast<KdmItem*>( parent() );
@@ -555,11 +555,11 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
 	if (s == "box") {	// box value
 		dType = DTbox;
 		val = 0;
-	} else if ((p = s.tqfind( '%' )) >= 0) {	// percent value
+	} else if ((p = s.find( '%' )) >= 0) {	// percent value
 		dType = DTpercent;
 		TQString sCopy = s;
 		sCopy.remove( p, 1 );
-		sCopy.tqreplace( ',', '.' );
+		sCopy.replace( ',', '.' );
 		val = (int)sCopy.toDouble();
 	} else {		// int value
 		dType = DTpixel;
@@ -568,7 +568,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
 			sCopy.remove( 0, 1 );
 			dType = DTnpixel;
 		}
-		sCopy.tqreplace( ',', '.' );
+		sCopy.replace( ',', '.' );
 		val = (int)sCopy.toDouble();
 	}
 }
@@ -576,7 +576,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
 void
 KdmItem::parseFont( const TQString &s, TQFont &font )
 {
-	int splitAt = s.tqfindRev( ' ' );
+	int splitAt = s.findRev( ' ' );
 	if (splitAt < 1)
 		return;
 	font.setFamily( s.left( splitAt ) );
diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp
index 64c2c4a1c..c019851e1 100644
--- a/kdm/kfrontend/themer/kdmlabel.cpp
+++ b/kdm/kfrontend/themer/kdmlabel.cpp
@@ -96,7 +96,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name )
 	}
 
 	// Check if this is a timer label)
-	label.isTimer = label.text.tqfind( "%c" ) >= 0;
+	label.isTimer = label.text.find( "%c" ) >= 0;
 	if (label.isTimer) {
 		timer = new TQTimer( this );
 		timer->start( 1000 );
@@ -110,7 +110,7 @@ KdmLabel::setTextInt( const TQString &txt)
 {
   // TODO: catch &&
         cText = txt;
-	cAccel = txt.tqfind('&');
+	cAccel = txt.find('&');
 	delete myAccel;
 	myAccel = 0;
 	if (cAccel != -1) {
@@ -250,7 +250,7 @@ KdmLabel::lookupText( const TQString &t )
 {
 	TQString text = t;
 
-	text.tqreplace( '_', '&' );
+	text.replace( '_', '&' );
 
 	TQMap<TQChar,TQString> m;
 	struct utsname uts;
diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp
index 9b90799d5..af64714b8 100644
--- a/kdm/kfrontend/themer/kdmpixmap.cpp
+++ b/kdm/kfrontend/themer/kdmpixmap.cpp
@@ -163,7 +163,7 @@ KdmPixmap::loadPixmap( PixmapStruct::PixmapClass *pClass )
   TQString fullpath = pClass->fullpath;
 
   kdDebug() << timestamp() << " load " << fullpath << endl;
-  int index = fullpath.tqfindRev('.');
+  int index = fullpath.findRev('.');
   TQString ext = fullpath.right(fullpath.length() - index);
   fullpath = fullpath.left(index);
   kdDebug() << timestamp() << " ext " << ext << " " << fullpath << endl;
diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp
index 5cab6a0cd..d6b2e6e0e 100644
--- a/kdm/kfrontend/themer/kdmthemer.cpp
+++ b/kdm/kfrontend/themer/kdmthemer.cpp
@@ -223,7 +223,7 @@ KdmThemer::generateItems( KdmItem *parent, const TQDomNode &node )
 			TQString id = el.attribute("id");
 			if (id.startsWith("plugin-specific-")) {
 			        id = id.mid(strlen("plugin-specific-"));
-			        if (!_pluginsLogin.tqcontains(id))
+			        if (!_pluginsLogin.contains(id))
 			               continue;
 			}
 
@@ -281,7 +281,7 @@ bool KdmThemer::willDisplay( const TQDomNode &node )
 		TQStringList modeList = TQStringList::split( ",", modes );
 
 		// If current mode isn't in this list, do not display item
-		if (modeList.tqfind( m_currentMode ) == modeList.end())
+		if (modeList.find( m_currentMode ) == modeList.end())
 			return false;
 	}