6 files changed, 14 insertions, 14 deletions

diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp
index a89e693..b77b5d2 100644
--- a/kicker-applets/mediacontrol/amarokInterface.cpp
+++ b/kicker-applets/mediacontrol/amarokInterface.cpp
@@ -68,7 +68,7 @@ void AmarokInterface::myInit()
 
 void AmarokInterface::appRegistered ( const TQCString &appId )
 {
-   if(appId.tqcontains("amarok",false) )
+   if(appId.contains("amarok",false) )
    {
       mAppId = appId;
       emit playerStarted();
@@ -78,7 +78,7 @@ void AmarokInterface::appRegistered ( const TQCString &appId )
 
 void AmarokInterface::appRemoved ( const TQCString &appId )
 {
-   if ( appId.tqcontains("amarok",false) )
+   if ( appId.contains("amarok",false) )
    {
        // is there still another amarok alive?
       if ( findRunningAmarok() )
@@ -264,7 +264,7 @@ bool AmarokInterface::findRunningAmarok()
 
    for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
    {
-      if ((*iterator).tqcontains("amarok",false))
+      if ((*iterator).contains("amarok",false))
       {
          if (kapp->dcopClient()->call((*iterator), "player", "interfaces()", data, replyType, replyData) )
     {
@@ -274,7 +274,7 @@ bool AmarokInterface::findRunningAmarok()
                QCStringList list;
                reply >> list;
 
-               if ( list.tqcontains("AmarokPlayerInterface") )
+               if ( list.contains("AmarokPlayerInterface") )
                {
                   kdDebug(90200) << "mediacontrol: amarok found" << endl;
                   mAppId = *iterator;
diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp
index 6ac8b49..b055424 100644
--- a/kicker-applets/mediacontrol/jukInterface.cpp
+++ b/kicker-applets/mediacontrol/jukInterface.cpp
@@ -68,7 +68,7 @@ void JuKInterface::myInit()
 
 void JuKInterface::appRegistered ( const TQCString &appId )
 {
-	if(appId.tqcontains("juk",false) )
+	if(appId.contains("juk",false) )
 	{
 		mAppId = appId;
 
@@ -93,7 +93,7 @@ void JuKInterface::appRegistered ( const TQCString &appId )
 
 void JuKInterface::appRemoved ( const TQCString &appId )
 {
-	if ( appId.tqcontains("juk",false) )
+	if ( appId.contains("juk",false) )
 	{
 	 	// is there still another juk alive?
 		if ( findRunningJuK() )
@@ -282,7 +282,7 @@ bool JuKInterface::findRunningJuK()
 
 	for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
 	{
-		if ((*iterator).tqcontains("juk",false))
+		if ((*iterator).contains("juk",false))
 		{
 			mAppId = *iterator;
 			return true;
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index 9068aeb..cb94759 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -78,7 +78,7 @@ class MediaControlToolTip : public TQToolTip
 		virtual void maybeTip(const TQPoint &pt)
 		{
 			TQRect rc( mWidget->rect());
-			if (rc.tqcontains(pt))
+			if (rc.contains(pt))
 			{
 				tip ( rc, mPlayer->getTrackTitle() );
 			}
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index 5f5d06a..2636398 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -106,7 +106,7 @@ void MediaControlConfig::load()
 	// find the playerstring from config in the playerlist and select it if found
 	TQListBoxItem *item = 0;
 
-	item = _child->playerListBox->tqfindItem(  _configFrontend->player() );
+	item = _child->playerListBox->findItem(  _configFrontend->player() );
 	if ( item )
 		_child->playerListBox->setCurrentItem ( item );
 	else
@@ -118,7 +118,7 @@ void MediaControlConfig::load()
 	_child->mWheelScrollAmount->setValue( _configFrontend->mouseWheelSpeed() );
 
 	// Select the used Theme
-	item = _child->themeListBox->tqfindItem(  _configFrontend->theme() );
+	item = _child->themeListBox->findItem(  _configFrontend->theme() );
 	if ( item )
 		_child->themeListBox->setCurrentItem( item );
 	else
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index e9be885..ea350d2 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -452,7 +452,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
                 while (!path.empty())
                 {
                     if (dispatch((TQString("add \"")
-                                  +path.join("/").tqreplace("\"","\\\"")
+                                  +path.join("/").replace("\"","\\\"")
                                   +TQString("\"\n")).latin1()))
                     {
                         if (fetchOk()) break;
diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index 4047eb6..4ba4333 100644
--- a/kicker-applets/mediacontrol/noatunInterface.cpp
+++ b/kicker-applets/mediacontrol/noatunInterface.cpp
@@ -66,7 +66,7 @@ void NoatunInterface::myInit()
 
 void NoatunInterface::appRegistered(const TQCString &appId)
 {
-	if (appId.tqcontains("noatun",false))
+	if (appId.contains("noatun",false))
 	{
 		mAppId = appId;
 		emit playerStarted();
@@ -76,7 +76,7 @@ void NoatunInterface::appRegistered(const TQCString &appId)
 
 void NoatunInterface::appRemoved(const TQCString &appId)
 {
-	if (appId.tqcontains("noatun",false))
+	if (appId.contains("noatun",false))
 	{
 	 	// is there still another noatun alive?
 		if (findRunningNoatun())
@@ -273,7 +273,7 @@ bool NoatunInterface::findRunningNoatun()
 
 	for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
 	{
-		if ((*iterator).tqcontains("noatun", false))
+		if ((*iterator).contains("noatun", false))
 		{
 			mAppId = *iterator;
 			return true;