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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

9 files changed, 116 insertions, 116 deletions

diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index ee9c0c4a..33a4b365 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -118,7 +118,7 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio
         return;
     //okay, now we need to change the message.escapedBody from real HTML to aimhtml.
     //looking right now for docs on that "format".
-    //looks like everything except for alignment codes comes in the format of spans
+    //looks like everything except for tqalignment codes comes in the format of spans
 
     //font-style:italic -> <i>
     //font-weight:600 -> <b> (anything > 400 should be <b>, 400 is not bold)
@@ -127,53 +127,53 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio
     //font-size:xxpt -> <font ptsize=xx>
 
     s=message.escapedBody();
-    s.replace ( TQRegExp( TQString::fromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
-            TQString::fromLatin1("<style>\\1;\"\\2</style>"));
+    s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
+            TQString::tqfromLatin1("<style>\\1;\"\\2</style>"));
 
-    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
-                TQString::fromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
+    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
+                TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
 
-    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
-                TQString::fromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
+    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
+                TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
 
-    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
-                TQString::fromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
+    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
+                TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
 
-    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
-                TQString::fromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
+                TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
 
-    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
-                TQString::fromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
+                TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
 
-    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
-                TQString::fromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
+                TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
 
-    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
-                TQString::fromLatin1("\\2"));
+    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
+                TQString::tqfromLatin1("\\2"));
 
     //okay now change the <font ptsize="xx"> to <font size="xx">
 
     //0-9 are size 1
-    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"\\d\">")),
-                TQString::fromLatin1("<font size=\"1\">"));
+    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")),
+                TQString::tqfromLatin1("<font size=\"1\">"));
     //10-11 are size 2
-    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[01]\">")),
-                TQString::fromLatin1("<font size=\"2\">"));
+    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")),
+                TQString::tqfromLatin1("<font size=\"2\">"));
     //12-13 are size 3
-    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[23]\">")),
-                TQString::fromLatin1("<font size=\"3\">"));
+    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")),
+                TQString::tqfromLatin1("<font size=\"3\">"));
     //14-16 are size 4
-    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[456]\">")),
-                TQString::fromLatin1("<font size=\"4\">"));
+    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")),
+                TQString::tqfromLatin1("<font size=\"4\">"));
     //17-22 are size 5
-    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
-                TQString::fromLatin1("<font size=\"5\">"));
+    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
+                TQString::tqfromLatin1("<font size=\"5\">"));
     //23-29 are size 6
-    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"2[3456789]\">")),TQString::fromLatin1("<font size=\"6\">"));
+    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">"));
     //30- (and any I missed) are size 7
-    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"[^\"]*\">")),TQString::fromLatin1("<font size=\"7\">"));
+    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">"));
 
-    s.replace ( TQRegExp ( TQString::fromLatin1("<br[ /]*>")), TQString::fromLatin1("<br>") );
+    s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
 
     kdDebug(14190) << k_funcinfo << "sending "
         << s << endl;
@@ -300,13 +300,13 @@ KActionMenu* AIMAccount::actionMenu()
 	// mActionMenu is managed by Kopete::Account.  It is deleted when
 	// it is no longer shown, so we can (safely) just make a new one here.
 	KActionMenu *mActionMenu = new KActionMenu(accountId(),
-		myself()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu");
+		myself()->onlinetqStatus().iconFor( this ), this, "AIMAccount::mActionMenu");
 
 	AIMProtocol *p = AIMProtocol::protocol();
 
 	TQString accountNick = myself()->property( Kopete::Global::Properties::self()->nickName() ).value().toString();
-	mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
-			i18n( "%2 <%1>" ).arg( accountId(), accountNick ));
+	mActionMenu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ),
+			i18n( "%2 <%1>" ).tqarg( accountId(), accountNick ));
 
 	mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this,
 	             TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") );
@@ -344,14 +344,14 @@ void AIMAccount::setAway(bool away, const TQString &awayReason)
 // 	kdDebug(14152) << k_funcinfo << accountId() << "reason is " << awayReason << endl;
 	if ( away )
 	{
-		engine()->setStatus( Client::Away, awayReason );
+		engine()->settqStatus( Client::Away, awayReason );
 		AIMMyselfContact* me = static_cast<AIMMyselfContact *> ( myself() );
 		me->setLastAwayMessage(awayReason);
 		me->setProperty( Kopete::Global::Properties::self()->awayMessage(), awayReason );
 	}
 	else
 	{
-		engine()->setStatus( Client::Online );
+		engine()->settqStatus( Client::Online );
 		AIMMyselfContact* me = static_cast<AIMMyselfContact *> ( myself() );
 		me->setLastAwayMessage(TQString());
 		me->removeProperty( Kopete::Global::Properties::self()->awayMessage() );
@@ -374,7 +374,7 @@ void AIMAccount::setUserProfile(const TQString &profile)
 	AIMMyselfContact* aimmc = dynamic_cast<AIMMyselfContact*>( myself() );
 	if ( aimmc )
 		aimmc->setOwnProfile( profile );
-	configGroup()->writeEntry( TQString::fromLatin1( "Profile" ), profile );
+	configGroup()->writeEntry( TQString::tqfromLatin1( "Profile" ), profile );
 }
 
 void AIMAccount::slotEditInfo()
@@ -532,13 +532,13 @@ void AIMAccount::slotJoinChat()
 
 void AIMAccount::slotGoOnline()
 {
-	if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away )
+	if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away )
 	{
 		kdDebug(14152) << k_funcinfo << accountId() << " was away. welcome back." << endl;
-		engine()->setStatus( Client::Online );
+		engine()->settqStatus( Client::Online );
 		myself()->removeProperty( Kopete::Global::Properties::self()->awayMessage() );
 	}
-	else if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline )
+	else if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline )
 	{
 		kdDebug(14152) << k_funcinfo << accountId() << " was offline. time to connect" << endl;
 		OscarAccount::connect();
@@ -606,7 +606,7 @@ void AIMAccount::messageReceived( const Oscar::Message& message )
         // Might be duplicate code from the parent class to get some needed information
         // Perhaps a refactoring is needed.
         kdDebug(14152) << k_funcinfo << "Checking to see if I'm online.." << endl;
-        if( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away )
+        if( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away )
         {
             TQString sender = Oscar::normalize( message.sender() );
             AIMContact* aimSender = static_cast<AIMContact *> ( contacts()[sender] ); //should exist now
@@ -759,7 +759,7 @@ void AIMAccount::connectWithPassword( const TQString & )
 
 	// Get the screen name for this account
 	TQString screenName = accountId();
-	TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "login.oscar.aol.com" ) );
+	TQString server = configGroup()->readEntry( "Server", TQString::tqfromLatin1( "login.oscar.aol.com" ) );
 	uint port = configGroup()->readNumEntry( "Port", 5190 );
 
 	Connection* c = setupConnection( server, port );
@@ -771,7 +771,7 @@ void AIMAccount::connectWithPassword( const TQString & )
 			<< "AIM network because no password was specified in the "
 			<< "preferences." << endl;
 	}
-	else if ( myself()->onlineStatus() == static_cast<AIMProtocol*>( protocol() )->statusOffline )
+	else if ( myself()->onlinetqStatus() == static_cast<AIMProtocol*>( protocol() )->statusOffline )
 	{
 		kdDebug(14152) << k_funcinfo << "Logging in as " << accountId() << endl ;
 		updateVersionUpdaterStamp();
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index 7a5de795..ffa81067 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -19,7 +19,7 @@
 #include <tqimage.h>
 #include <tqregexp.h>
 #include <tqtimer.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kapplication.h>
 #include <kactionclasses.h>
@@ -56,7 +56,7 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::
 	m_haveAwayMessage = false;
 	m_mobile = false;
 	// Set the last autoresponse time to the current time yesterday
-	m_lastAutoresponseTime = TQDateTime::currentDateTime().addDays(-1);
+	m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime().addDays(-1);
 
 	TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ),
 	                  this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) );
@@ -128,15 +128,15 @@ void AIMContact::setAwayMessage(const TQString &message)
 		"Called for '" << contactId() << "', away msg='" << message << "'" << endl;
 	TQString filteredMessage = message;
 	filteredMessage.replace(
-		TQRegExp(TQString::fromLatin1("<[hH][tT][mM][lL].*>(.*)</[hH][tT][mM][lL]>")),
-		TQString::fromLatin1("\\1"));
+		TQRegExp(TQString::tqfromLatin1("<[hH][tT][mM][lL].*>(.*)</[hH][tT][mM][lL]>")),
+		TQString::tqfromLatin1("\\1"));
 	filteredMessage.replace(
-		TQRegExp(TQString::fromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")),
-		TQString::fromLatin1("\\1") );
-	TQRegExp fontRemover( TQString::fromLatin1("<[fF][oO][nN][tT].*>(.*)</[fF][oO][nN][tT]>") );
+		TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")),
+		TQString::tqfromLatin1("\\1") );
+	TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)</[fF][oO][nN][tT]>") );
 	fontRemover.setMinimal(true);
 	while ( filteredMessage.find( fontRemover ) != -1 )
-		filteredMessage.replace( fontRemover, TQString::fromLatin1("\\1") );
+		filteredMessage.replace( fontRemover, TQString::tqfromLatin1("\\1") );
 	setProperty(mProtocol->awayMessage, filteredMessage);
 }
 
@@ -148,7 +148,7 @@ int AIMContact::warningLevel() const
 void AIMContact::updateSSIItem()
 {
 	if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false &&
-	     onlineStatus() == Kopete::OnlineStatus::Unknown )
+	     onlinetqStatus() == Kopete::OnlineStatus::Unknown )
 	{
 		//make sure they're offline
 		setOnlineStatus( static_cast<AIMProtocol*>( protocol() )->statusOffline );
@@ -351,11 +351,11 @@ void AIMContact::warnUser()
 	                        "(Warning a user on AIM will result in a \"Warning Level\"" \
 	                        " increasing for the user you warn. Once this level has reached a" \
 	                        " certain point, they will not be able to sign on. Please do not abuse" \
-	                        " this function, it is meant for legitimate practices.)</qt>" ).arg( nick );
+	                        " this function, it is meant for legitimate practices.)</qt>" ).tqarg( nick );
 
 
 	int result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), message,
-	                                               i18n( "Warn User %1?" ).arg( nick ),
+	                                               i18n( "Warn User %1?" ).tqarg( nick ),
 	                                               i18n( "Warn Anonymously" ), i18n( "Warn" ) );
 
 	if ( result == KMessageBox::Yes )
@@ -383,7 +383,7 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *)
 		return;
 	//okay, now we need to change the message.escapedBody from real HTML to aimhtml.
 	//looking right now for docs on that "format".
-	//looks like everything except for alignment codes comes in the format of spans
+	//looks like everything except for tqalignment codes comes in the format of spans
 
 	//font-style:italic -> <i>
 	//font-weight:600 -> <b> (anything > 400 should be <b>, 400 is not bold)
@@ -392,59 +392,59 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *)
 	//font-size:xxpt -> <font ptsize=xx>
 
 	s=message.escapedBody();
-	s.replace ( TQRegExp( TQString::fromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
-			TQString::fromLatin1("<style>\\1;\"\\2</style>"));
+	s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
+			TQString::tqfromLatin1("<style>\\1;\"\\2</style>"));
 
-	s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
-	            TQString::fromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
+	s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
+	            TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
 
-	s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
-	            TQString::fromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
+	s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
+	            TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
 
-	s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
-	            TQString::fromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
+	s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
+	            TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
 
-	s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
-	            TQString::fromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+	s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
+	            TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
 
-	s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
-				TQString::fromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+	s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
+				TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
 
-	s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
-	            TQString::fromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+	s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
+	            TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
 
-	s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
-	            TQString::fromLatin1("\\2"));
+	s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
+	            TQString::tqfromLatin1("\\2"));
 
 	//okay now change the <font ptsize="xx"> to <font size="xx">
 
 	//0-9 are size 1
-	s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"\\d\">")),
-	            TQString::fromLatin1("<font size=\"1\">"));
+	s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")),
+	            TQString::tqfromLatin1("<font size=\"1\">"));
 	//10-11 are size 2
-	s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[01]\">")),
-	            TQString::fromLatin1("<font size=\"2\">"));
+	s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")),
+	            TQString::tqfromLatin1("<font size=\"2\">"));
 	//12-13 are size 3
-	s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[23]\">")),
-	            TQString::fromLatin1("<font size=\"3\">"));
+	s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")),
+	            TQString::tqfromLatin1("<font size=\"3\">"));
 	//14-16 are size 4
-	s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[456]\">")),
-	            TQString::fromLatin1("<font size=\"4\">"));
+	s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")),
+	            TQString::tqfromLatin1("<font size=\"4\">"));
 	//17-22 are size 5
-	s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
-	            TQString::fromLatin1("<font size=\"5\">"));
+	s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
+	            TQString::tqfromLatin1("<font size=\"5\">"));
 	//23-29 are size 6
-	s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"2[3456789]\">")),TQString::fromLatin1("<font size=\"6\">"));
+	s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">"));
 	//30- (and any I missed) are size 7
-	s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"[^\"]*\">")),TQString::fromLatin1("<font size=\"7\">"));
+	s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">"));
 
 	// strip left over line break
-	s.remove(TQRegExp(TQString::fromLatin1("<br\b[^>]*>$")));
+	s.remove(TQRegExp(TQString::tqfromLatin1("<br\b[^>]*>$")));
 
-	s.replace ( TQRegExp ( TQString::fromLatin1("<br[ /]*>")), TQString::fromLatin1("<br>") );
+	s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
 
 	// strip left over line break
-	s.remove( TQRegExp( TQString::fromLatin1( "<br>$" ) ) );
+	s.remove( TQRegExp( TQString::tqfromLatin1( "<br>$" ) ) );
 
 	kdDebug(14190) << k_funcinfo << "sending "
 		<< s << endl;
@@ -475,9 +475,9 @@ void AIMContact::updateFeatures()
 void AIMContact::sendAutoResponse(Kopete::Message& msg)
 {
 	// The target time is 2 minutes later than the last message
-	int delta = m_lastAutoresponseTime.secsTo( TQDateTime::currentDateTime() );
+	int delta = m_lastAutoresponseTime.secsTo( TQDateTime::tqcurrentDateTime() );
 	kdDebug(14152) << k_funcinfo << "Last autoresponse time: " << m_lastAutoresponseTime << endl;
-	kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::currentDateTime() << endl;
+	kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::tqcurrentDateTime() << endl;
 	kdDebug(14152) << k_funcinfo << "Difference: " << delta << endl;
 	// Check to see if we're past that time
 	if(delta > 120)
@@ -509,7 +509,7 @@ void AIMContact::sendAutoResponse(Kopete::Message& msg)
 		manager(Kopete::Contact::CanCreate)->appendMessage(msg);
 		manager(Kopete::Contact::CanCreate)->messageSucceeded();
 		// Update the last autoresponse time
-		m_lastAutoresponseTime = TQDateTime::currentDateTime();
+		m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime();
 	}
 	else
 	{
diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp
index 0b70ac89..fe4dbf22 100644
--- a/kopete/protocols/oscar/aim/aimprotocol.cpp
+++ b/kopete/protocols/oscar/aim/aimprotocol.cpp
@@ -46,7 +46,7 @@ AIMProtocol* AIMProtocol::protocolStatic_ = 0L;
 
 AIMProtocolHandler::AIMProtocolHandler() : Kopete::MimeTypeHandler(false)
 {
-	registerAsProtocolHandler(TQString::fromLatin1("aim"));
+	registerAsProtocolHandler(TQString::tqfromLatin1("aim"));
 }
 
 void AIMProtocolHandler::handleURL(const KURL &url) const
@@ -189,7 +189,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const
 		}
 
 		if (KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(),
-		                               i18n("Do you want to add '%1' to your contact list?").arg(command),
+		                               i18n("Do you want to add '%1' to your contact list?").tqarg(command),
 		                               TQString(), i18n("Add"), i18n("Do Not Add"))
 		    != KMessageBox::Yes)
 		{
@@ -212,7 +212,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const
 		else
 			KMessageBox::sorry( Kopete::UI::Global::mainWidget(),
 			                    i18n( "Unable to connect to the chat room %1 because the account"
-			                          " for %2 is not connected." ).arg( firstParam ).arg( aimAccount->accountId() ),
+			                          " for %2 is not connected." ).tqarg( firstParam ).tqarg( aimAccount->accountId() ),
 			                    TQString() );
 		
 	}
@@ -286,8 +286,8 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac
 	if ( serializedData.contains( "ssi_type" ) )
 	{
 		ssiName = serializedData["ssi_name"];
-		TQString authStatus = serializedData["ssi_waitingAuth"];
-		if ( authStatus == "true" )
+		TQString authtqStatus = serializedData["ssi_waitingAuth"];
+		if ( authtqStatus == "true" )
 		ssiWaitingAuth = true;
 		ssiGid = serializedData["ssi_gid"].toUInt();
 		ssiBid = serializedData["ssi_bid"].toUInt();
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp
index fd4ba096..2ed71d94 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.cpp
+++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqtimer.h>
 
@@ -39,7 +39,7 @@
 AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool modal,
                                       TQWidget *parent, const char* name )
 	: KDialogBase( parent, name, modal, i18n( "User Information on %1" )
-	               .arg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ),
+	               .tqarg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ),
 	               Cancel | Ok , Ok, true )
 {
 	kdDebug(14200) << k_funcinfo << "for contact '" << c->contactId() << "'" << endl;
@@ -133,7 +133,7 @@ void AIMUserInfoDialog::slotUpdateClicked()
 	{
 		//m_contact->rename(newNick);
 		//emit updateNickname(newNick);
-		setCaption(i18n("User Information on %1").arg(newNick));
+		setCaption(i18n("User Information on %1").tqarg(newNick));
 	}
 
 }
@@ -150,7 +150,7 @@ void AIMUserInfoDialog::slotSaveClicked()
 		{
 			//m_contact->rename(newNick);
 			//emit updateNickname(newNick);
-			setCaption(i18n("User Information on %1").arg(newNick));
+			setCaption(i18n("User Information on %1").tqarg(newNick));
 		}
 
 		mAccount->setUserProfile(userInfoEdit->text());
diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
index c59ac675..f00741c9 100644
--- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
+++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
@@ -20,7 +20,7 @@
 
 #include "kopeteaccount.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
index c2ec9844..deaa2ff2 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
@@ -40,7 +40,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -72,7 +72,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>layout4</cstring>
+                                    <cstring>tqlayout4</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -165,7 +165,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -174,7 +174,7 @@
                                 <property name="text">
                                     <string>To connect to the AOL Instant Messaging network, you will need to use a screen name from AIM, AOL, or .Mac.&lt;br&gt;&lt;br&gt;If you do not currently have an AIM screen name, please click the button to create one.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -198,7 +198,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>90</height>
@@ -242,7 +242,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout58</cstring>
+                                    <cstring>tqlayout58</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -342,7 +342,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>200</height>
@@ -455,7 +455,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>31</width>
                                 <height>225</height>
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
index 818543d7..2e0100ab 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
@@ -1,7 +1,7 @@
 #include "aimeditaccountwidget.h"
 #include "aimeditaccountui.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui
index 188e4aad..9457068e 100644
--- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui
+++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui
@@ -12,7 +12,7 @@
             <height>408</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>360</width>
             <height>400</height>
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -92,7 +92,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -134,7 +134,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -173,7 +173,7 @@
             <property name="text">
                 <string>Away message:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
         </widget>
@@ -213,7 +213,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>64</width>
                     <height>16</height>
diff --git a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
index 5b2d084b..fdfe2a53 100644
--- a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
+++ b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
@@ -37,7 +37,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -54,7 +54,7 @@
             <property name="sizeType">
                 <enum>Maximum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>60</width>
                     <height>20</height>
@@ -111,7 +111,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>