4 files changed, 15 insertions, 15 deletions

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;
 	}