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/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 21 insertions, 21 deletions

diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/kimproxy/interface/kimiface.h
index dcf210f23..f3212df6d 100644
--- a/interfaces/kimproxy/interface/kimiface.h
+++ b/interfaces/kimproxy/interface/kimiface.h
@@ -179,7 +179,7 @@ k_dcop:
 	 *
 	 * @see allContacts()
 	 * @see presenceString()
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 */
 	virtual bool isPresent( const TQString & uid ) = 0;
@@ -197,7 +197,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceString()
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 */
 	virtual TQString displayName( const TQString & uid ) = 0;
@@ -214,7 +214,7 @@ k_dcop:
 	 *         TQString::null if the UID is unknown
 	 *
 	 * @see isPresent()
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 */
 	virtual TQString presenceString( const TQString & uid ) = 0;
@@ -247,7 +247,7 @@ k_dcop:
 	 * @see presenceString()
 	 * @see KABC::Addressee::uid()
 	 */
-	virtual int presencetqStatus( const TQString & uid ) = 0;
+	virtual int presenceStatus( const TQString & uid ) = 0;
 
 	/**
 	 * @brief Indicate if a given contact can receive files
@@ -309,7 +309,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceString()
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 */
 	virtual TQPixmap icon( const TQString & uid ) = 0;
@@ -467,7 +467,7 @@ k_dcop_signals:
 	/**
 	 * @brief Indicates that a contact's presence has changed
 	 *
-	 * Notifies connected DCOP tqreceivers about a change in a contact's
+	 * Notifies connected DCOP receivers about a change in a contact's
 	 * presence.
 	 *
 	 * Implementations just have to call this method with the appropriate
@@ -476,9 +476,9 @@ k_dcop_signals:
 	 * @param uid the KABC UID whose presence changed
 	 * @param appId the DCOP application ID of the program the signal
 	 *        originates from
-	 * @param presence the new presence's numeric value. See presencetqStatus()
+	 * @param presence the new presence's numeric value. See presenceStatus()
 	 *
-	 * @see presencetqStatus()
+	 * @see presenceStatus()
 	 * @see KABC::Addressee::uid()
 	 * @see DCOPClient::appId()
 	 */
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp
index 3ca9ae7b1..44f828a02 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/kimproxy/library/kimproxy.cpp
@@ -248,7 +248,7 @@ bool KIMProxy::initialize()
 						{
 							m_apps_available = true;
 							//kdDebug( 790 ) << " app name: " << (*offer)->name() << ", has instance " << *app << ", dcopService: " << dcopService << endl;
-							if ( !m_im_client_stubs.tqfind( dcopService ) )
+							if ( !m_im_client_stubs.find( dcopService ) )
 							{
 								kdDebug( 790 ) << "App " << *app << ", dcopObjectId " << dcopObjectId << " found, using it for presence info." << endl;
 								m_im_client_stubs.insert( *app, new KIMIface_stub( d->dc, *app, dcopObjectId ) );
@@ -284,7 +284,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
 		if ( appId.left( dcopService.length() ) == dcopService )
 		{
 			// if it's not already known, insert it
-			if ( !m_im_client_stubs.tqfind( appId ) )
+			if ( !m_im_client_stubs.find( appId ) )
 			{
 				newApp = true;
 				kdDebug( 790 ) << "App: " << appId << ", dcopService: " << dcopService << " started, using it for presence info."<< endl;
@@ -301,7 +301,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
 void KIMProxy::unregisteredFromDCOP( const TQCString& appId )
 {
 	//kdDebug( 790 ) << k_funcinfo << appId << endl;
-	if ( m_im_client_stubs.tqfind( appId ) )
+	if ( m_im_client_stubs.find( appId ) )
 	{
 		kdDebug( 790 ) << appId << " quit, removing its presence info." << endl;
 		
@@ -558,14 +558,14 @@ bool KIMProxy::imAppsAvailable()
 bool KIMProxy::startPreferredApp()
 {
 	TQString preferences = TQString("[X-DCOP-ServiceName] = '%1'").arg( preferredApp() );
-	// start/tqfind an instance of DCOP/InstantMessenger
+	// start/find an instance of DCOP/InstantMessenger
 	TQString error;
 	TQCString dcopService;
 	// Get a preferred IM client.
 	// The app will notify itself to us using registeredToDCOP, so we don't need to record a stub for it here
 	// FIXME: error in preferences, see debug output
 	preferences = TQString::null;
-	int result = KDCOPServiceStarter::self()->tqfindServiceFor( IM_SERVICE_TYPE, TQString::null, preferences, &error, &dcopService );
+	int result = KDCOPServiceStarter::self()->findServiceFor( IM_SERVICE_TYPE, TQString::null, preferences, &error, &dcopService );
 
 	kdDebug( 790 ) << k_funcinfo << "error was: " << error << ", dcopService: " << dcopService << endl;
 
@@ -578,14 +578,14 @@ void KIMProxy::pollAll( const TQString &uid )
 /*	// We only need to call this function if we don't have any data at all
 	// otherwise, the data will be kept fresh by received presence change
 	// DCOP signals
-	if ( !d->presence_map.tqcontains( uid ) )
+	if ( !d->presence_map.contains( uid ) )
 	{
 		AppPresence *presence = new AppPresence();
 		// record current presence from known clients
 		TQDictIterator<KIMIface_stub> it( m_im_client_stubs );
 		for ( ; it.current(); ++it )
 		{
-			presence->insert( it.currentKey().ascii(), it.current()->presencetqStatus( uid ) ); // m_im_client_stubs has qstring keys...
+			presence->insert( it.currentKey().ascii(), it.current()->presenceStatus( uid ) ); // m_im_client_stubs has qstring keys...
 		}
 		d->presence_map.insert( uid, presence );
 	}*/
@@ -603,7 +603,7 @@ void KIMProxy::pollApp( const TQCString & appId )
 		ContactPresenceListCurrent current = d->presence_map[ *it ];
 		AppPresenceCurrent ap;
 		ap.appId = appId;
-		ap.presence = appStub->presencetqStatus( *it );
+		ap.presence = appStub->presenceStatus( *it );
 		current.append( ap );
 
 		d->presence_map.insert( *it, current );
@@ -618,7 +618,7 @@ KIMIface_stub * KIMProxy::stubForUid( const TQString &uid )
 	// get best appPresence
 	AppPresenceCurrent ap = d->presence_map[ uid ].best();
 	// look up the presence string from that app
-		return m_im_client_stubs.tqfind( ap.appId );
+		return m_im_client_stubs.find( ap.appId );
 }
 
 KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
@@ -626,7 +626,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
 	KIMIface_stub * app;
 	// see if the preferred client supports this protocol
 	TQString preferred = preferredApp();
-	if ( ( app = m_im_client_stubs.tqfind( preferred ) ) )
+	if ( ( app = m_im_client_stubs.find( preferred ) ) )
 	{
 		if ( app->protocols().grep( protocol ).count() > 0 )
 			return app;
diff --git a/interfaces/kimproxy/library/kimproxy.h b/interfaces/kimproxy/library/kimproxy.h
index da1561152..d4312b341 100644
--- a/interfaces/kimproxy/library/kimproxy.h
+++ b/interfaces/kimproxy/library/kimproxy.h
@@ -43,8 +43,8 @@ class KURL;
 class ContactPresenceListCurrent;
 
 /** FIXME: remove for KDE4, binary compability again. */
-typedef TQMap<TQCString, int> AppPresence; 		// appId->presence; tqcontains all applications' ideas of a user's presence
-typedef TQDict<AppPresence> PresenceMap;			// uid->AppPresence; tqcontains a AppPresences for all users
+typedef TQMap<TQCString, int> AppPresence; 		// appId->presence; contains all applications' ideas of a user's presence
+typedef TQDict<AppPresence> PresenceMap;			// uid->AppPresence; contains a AppPresences for all users
 /** FIXME: remove presenceMap and call this presenceMap in KDE4.  This hack is for binary compatibility */
 typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap;
 
@@ -301,7 +301,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceString()
 		 * @see presenceIcon()
-		 * @see KIMIface::presencetqStatus()
+		 * @see KIMIface::presenceStatus()
 		 * @see KABC::Addressee::uid()
 		 */
 		int presenceNumeric( const TQString& uid );