From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: Revert automated changes Sorry guys, they are just not ready for
 prime time Work will continue as always

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kioslave/media/libmediacommon/actionlistboxitem.cpp     |  2 +-
 kioslave/media/libmediacommon/mediamanagersettings.kcfg |  2 +-
 kioslave/media/libmediacommon/notifieraction.cpp        |  2 +-
 kioslave/media/libmediacommon/notifieropenaction.cpp    |  2 +-
 kioslave/media/libmediacommon/notifierserviceaction.cpp |  4 ++--
 kioslave/media/libmediacommon/notifiersettings.cpp      | 10 +++++-----
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kioslave/media/libmediacommon')

diff --git a/kioslave/media/libmediacommon/actionlistboxitem.cpp b/kioslave/media/libmediacommon/actionlistboxitem.cpp
index 42a724c75..271d2e487 100644
--- a/kioslave/media/libmediacommon/actionlistboxitem.cpp
+++ b/kioslave/media/libmediacommon/actionlistboxitem.cpp
@@ -29,7 +29,7 @@ ActionListBoxItem::ActionListBoxItem(NotifierAction *action, TQString mimetype,
 {
 	TQString text = m_action->label();
 	
-	if ( m_action->autoMimetypes().tqcontains( mimetype ) )
+	if ( m_action->autoMimetypes().contains( mimetype ) )
 	{
 		text += " (" + i18n( "Auto Action" ) + ")";
 	}
diff --git a/kioslave/media/libmediacommon/mediamanagersettings.kcfg b/kioslave/media/libmediacommon/mediamanagersettings.kcfg
index 718a17fa0..4c9615ade 100644
--- a/kioslave/media/libmediacommon/mediamanagersettings.kcfg
+++ b/kioslave/media/libmediacommon/mediamanagersettings.kcfg
@@ -16,7 +16,7 @@
     </entry>
     <entry name="AutostartEnabled" type="Bool">
       <label>Enable medium application autostart after mount</label>
-      <whatsthis>Allows KDE to autostart application after a medium mount if it tqcontains an Autostart or an Autoopen file.</whatsthis>
+      <whatsthis>Allows KDE to autostart application after a medium mount if it contains an Autostart or an Autoopen file.</whatsthis>
       <default>true</default>
     </entry>
   </group>
diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp
index 9a6572150..d10314701 100644
--- a/kioslave/media/libmediacommon/notifieraction.cpp
+++ b/kioslave/media/libmediacommon/notifieraction.cpp
@@ -69,7 +69,7 @@ TQString NotifierAction::label() const
 
 void NotifierAction::addAutoMimetype( const TQString &mimetype )
 {
-	if ( !m_autoMimetypes.tqcontains( mimetype ) )
+	if ( !m_autoMimetypes.contains( mimetype ) )
 	{
 		m_autoMimetypes.append( mimetype );
 	}
diff --git a/kioslave/media/libmediacommon/notifieropenaction.cpp b/kioslave/media/libmediacommon/notifieropenaction.cpp
index 01c8b010f..4d6d8025c 100644
--- a/kioslave/media/libmediacommon/notifieropenaction.cpp
+++ b/kioslave/media/libmediacommon/notifieropenaction.cpp
@@ -40,6 +40,6 @@ void NotifierOpenAction::execute(KFileItem &medium)
 
 bool NotifierOpenAction::supportsMimetype( const TQString &mimetype ) const
 {
-	return !mimetype.tqcontains( "blank" ) && !mimetype.tqcontains( "encrypted" );
+	return !mimetype.contains( "blank" ) && !mimetype.contains( "encrypted" );
 }
 
diff --git a/kioslave/media/libmediacommon/notifierserviceaction.cpp b/kioslave/media/libmediacommon/notifierserviceaction.cpp
index 8cf916848..c7bece4f8 100644
--- a/kioslave/media/libmediacommon/notifierserviceaction.cpp
+++ b/kioslave/media/libmediacommon/notifierserviceaction.cpp
@@ -99,7 +99,7 @@ void NotifierServiceAction::updateFilePath()
 	if ( !m_filePath.isEmpty() ) return;
 	
 	TQString action_name = m_service.m_strName;
-	action_name.tqreplace(   " ", "_" );
+	action_name.replace(   " ", "_" );
 	
 	TQDir actions_dir( locateLocal( "data", "konqueror/servicemenus/", true ) );
 
@@ -144,7 +144,7 @@ bool NotifierServiceAction::isWritable() const
 
 bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const
 {
-	return m_mimetypes.tqcontains(mimetype);
+	return m_mimetypes.contains(mimetype);
 }
 
 void NotifierServiceAction::save() const
diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp
index 332832b98..d1ab55d87 100644
--- a/kioslave/media/libmediacommon/notifiersettings.cpp
+++ b/kioslave/media/libmediacommon/notifiersettings.cpp
@@ -111,7 +111,7 @@ TQValueList<NotifierAction*> NotifierSettings::actionsForMimetype( const TQStrin
 
 bool NotifierSettings::addAction( NotifierServiceAction *action )
 {
-	if ( !m_idMap.tqcontains( action->id() ) )
+	if ( !m_idMap.contains( action->id() ) )
 	{
 		m_actions.insert( --m_actions.end(), action );
 		m_idMap[ action->id() ] = action;
@@ -153,7 +153,7 @@ void NotifierSettings::setAutoAction( const TQString &mimetype, NotifierAction *
 
 void NotifierSettings::resetAutoAction( const TQString &mimetype )
 {
-	if ( m_autoMimetypesMap.tqcontains( mimetype ) )
+	if ( m_autoMimetypesMap.contains( mimetype ) )
 	{
 		NotifierAction *action = m_autoMimetypesMap[mimetype];
 		action->removeAutoMimetype( mimetype );
@@ -179,7 +179,7 @@ void NotifierSettings::clearAutoActions()
 
 NotifierAction *NotifierSettings::autoActionForMimetype( const TQString &mimetype )
 {
-	if ( m_autoMimetypesMap.tqcontains( mimetype ) )
+	if ( m_autoMimetypesMap.contains( mimetype ) )
 	{
 		return m_autoMimetypesMap[mimetype];
 	}
@@ -238,7 +238,7 @@ void NotifierSettings::reload()
 		TQString mime = auto_it.key();
 		TQString action_id = auto_it.data();
 
-		if ( m_idMap.tqcontains( action_id ) )
+		if ( m_idMap.contains( action_id ) )
 		{
 			setAutoAction( mime, m_idMap[action_id] );
 		}
@@ -349,7 +349,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString
 				}
 			}
 		}
-		else if ( types.tqcontains(mimetype) )
+		else if ( types.contains(mimetype) )
 		{
 			return true;
 		}
-- 
cgit v1.2.1