Rename a number of old tq methods that are no longer tq specific

1 files changed, 18 insertions, 18 deletions

diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp
index 8595cb94..844cdcf8 100644
--- a/kopete/libkopete/kopetepluginmanager.cpp
+++ b/kopete/libkopete/kopetepluginmanager.cpp
@@ -91,8 +91,8 @@ PluginManager* PluginManager::self()
 
 PluginManager::PluginManager() : TQObject( tqApp ), d( new Private )
 {
-	d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "Kopete/Plugin" ),
-		TQString::tqfromLatin1( "[X-Kopete-Version] == 1000900" ) ) );
+	d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "Kopete/Plugin" ),
+		TQString::fromLatin1( "[X-Kopete-Version] == 1000900" ) ) );
 
 	// We want to add a reference to the application's event loop so we
 	// can remain in control when all windows are removed.
@@ -188,7 +188,7 @@ void PluginManager::shutdown()
 	      it != d->loadedPlugins.end(); /* EMPTY */ )
 	{
 		// Plugins could emit their ready for unload signal directly in response to this,
-		// which would tqinvalidate the current iterator. Therefore, we copy the iterator
+		// which would invalidate the current iterator. Therefore, we copy the iterator
 		// and increment it beforehand.
 		Private::InfoToPluginMap::ConstIterator current( it );
 		++it;
@@ -239,7 +239,7 @@ void PluginManager::slotShutdownTimeout()
 		remaining.append( it.data()->pluginId() );
 
 	kdWarning( 14010 ) << k_funcinfo << "Some plugins didn't shutdown in time!" << endl
-		<< "Remaining plugins: " << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl
+		<< "Remaining plugins: " << remaining.join( TQString::fromLatin1( ", " ) ) << endl
 		<< "Forcing Kopete shutdown now." << endl;
 
 	slotShutdownDone();
@@ -259,17 +259,17 @@ void PluginManager::loadAllPlugins()
 	// FIXME: We need session management here - Martijn
 
 	KConfig *config = KGlobal::config();
-	if ( config->hasGroup( TQString::tqfromLatin1( "Plugins" ) ) )
+	if ( config->hasGroup( TQString::fromLatin1( "Plugins" ) ) )
 	{
 		TQMap<TQString, bool> pluginsMap;
 
-		TQMap<TQString, TQString> entries = config->entryMap( TQString::tqfromLatin1( "Plugins" ) );
+		TQMap<TQString, TQString> entries = config->entryMap( TQString::fromLatin1( "Plugins" ) );
 		TQMap<TQString, TQString>::Iterator it;
 		for ( it = entries.begin(); it != entries.end(); ++it )
 		{
 			TQString key = it.key();
-			if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) )
-				pluginsMap.insert( key.left( key.length() - 7 ), (it.data() == TQString::tqfromLatin1( "true" )) );
+			if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) )
+				pluginsMap.insert( key.left( key.length() - 7 ), (it.data() == TQString::fromLatin1( "true" )) );
 		}
 
 		TQValueList<KPluginInfo *> plugins = availablePlugins( TQString() );
@@ -278,7 +278,7 @@ void PluginManager::loadAllPlugins()
 		for ( ; it2 != end; ++it2 )
 		{
 			// Protocols are loaded automatically so they aren't always in Plugins group. (fixes bug 167113)
-			if ( (*it2)->category() == TQString::tqfromLatin1( "Protocols" ) )
+			if ( (*it2)->category() == TQString::fromLatin1( "Protocols" ) )
 				continue;
 
 			TQString pluginName = (*it2)->pluginName();
@@ -343,10 +343,10 @@ Plugin * PluginManager::loadPlugin( const TQString &_pluginId, PluginLoadMode mo
 
 	// Try to find legacy code
 	// FIXME: Find any cases causing this, remove them, and remove this too - Richard
-	if ( pluginId.endsWith( TQString::tqfromLatin1( ".desktop" ) ) )
+	if ( pluginId.endsWith( TQString::fromLatin1( ".desktop" ) ) )
 	{
 		kdWarning( 14010 ) << "Trying to use old-style API!" << endl << kdBacktrace() << endl;
-		pluginId = pluginId.remove( TQRegExp( TQString::tqfromLatin1( ".desktop$" ) ) );
+		pluginId = pluginId.remove( TQRegExp( TQString::fromLatin1( ".desktop$" ) ) );
 	}
 
 	if ( mode == LoadSync )
@@ -376,8 +376,8 @@ Plugin *PluginManager::loadPluginInternal( const TQString &pluginId )
 		return d->loadedPlugins[ info ];
 
 	int error = 0;
-	Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::tqfromLatin1( "Kopete/Plugin" ),
-		TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), this, 0, TQStringList(), &error );
+	Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "Kopete/Plugin" ),
+		TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error );
 
 	if ( plugin )
 	{
@@ -471,8 +471,8 @@ Plugin* PluginManager::plugin( const TQString &_pluginId ) const
 	// FIXME: In the future we'll need to change this nevertheless to unify
 	//        the handling - Martijn
 	TQString pluginId = _pluginId;
-	if ( pluginId.endsWith( TQString::tqfromLatin1( "Protocol" ) ) )
-		pluginId = TQString::tqfromLatin1( "kopete_" ) + _pluginId.lower().remove( TQString::tqfromLatin1( "protocol" ) );
+	if ( pluginId.endsWith( TQString::fromLatin1( "Protocol" ) ) )
+		pluginId = TQString::fromLatin1( "kopete_" ) + _pluginId.lower().remove( TQString::fromLatin1( "protocol" ) );
 	// End hack
 
 	KPluginInfo *info = infoForPluginId( pluginId );
@@ -506,13 +506,13 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /*
 	config->setGroup( "Plugins" );
 
 	// FIXME: What is this for? This sort of thing is kconf_update's job - Richard
-	if ( !pluginId.startsWith( TQString::tqfromLatin1( "kopete_" ) ) )
-		pluginId.prepend( TQString::tqfromLatin1( "kopete_" ) );
+	if ( !pluginId.startsWith( TQString::fromLatin1( "kopete_" ) ) )
+		pluginId.prepend( TQString::fromLatin1( "kopete_" ) );
 
 	if ( !infoForPluginId( pluginId ) )
 		return false;
 
-	config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled );
+	config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled );
 	config->sync();
 
 	return true;