1 files changed, 11 insertions, 11 deletions

diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index f099d9822..3f3073ef7 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -124,7 +124,7 @@ namespace KMail {
       strategy = HeaderStrategy::brief();
 
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ;
 
@@ -223,7 +223,7 @@ namespace KMail {
       strategy = HeaderStrategy::rich();
 
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
 
@@ -394,15 +394,15 @@ namespace KMail {
       { 255,  25,   0 },
       { 255,   0,   0 }
     };
-    meterBar.setColor( 21, qRgb( 255, 255, 255 ) );
-    meterBar.setColor( 22, qRgb( 170, 170, 170 ) );
+    meterBar.setColor( 21, tqRgb( 255, 255, 255 ) );
+    meterBar.setColor( 22, tqRgb( 170, 170, 170 ) );
     if ( percent < 0 ) // grey is for errors
       meterBar.fill( 22 );
     else {
       meterBar.fill( 21 );
       int max = QMIN( 20, static_cast<int>( percent ) / 5 );
       for ( int i = 0; i < max; ++i ) {
-        meterBar.setColor( i+1, qRgb( gradient[i][0], gradient[i][1],
+        meterBar.setColor( i+1, tqRgb( gradient[i][0], gradient[i][1],
                                       gradient[i][2] ) );
         meterBar.setPixel( i, 0, i+1 );
       }
@@ -427,7 +427,7 @@ namespace KMail {
 
     // ### from kmreaderwin begin
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
     TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").arg(dir);
@@ -478,7 +478,7 @@ namespace KMail {
     ::KIMProxy *imProxy = KMKernel::self()->imProxy();
     TQString kabcUid;
     KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-    KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
+    KABC::AddresseeList addresses = addressBook->tqfindByEmail( KPIM::getFirstEmailAddress( message->from() ) );
 
     TQString photoURL;
     int photoWidth = 60;
@@ -493,7 +493,7 @@ namespace KMail {
           presence = imProxy->presenceString( kabcUid );
           if ( !presence.isEmpty() )
           {
-            TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" )
+            TQString presenceIcon = TQString::tqfromLatin1( " <img src=\"%1\"/>" )
                 .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
             presence += presenceIcon;
           }
@@ -853,7 +853,7 @@ namespace KMail {
     TQBuffer buffer( ba );
     buffer.open( IO_WriteOnly );
     image.save( &buffer, fmt );
-    return TQString::fromLatin1("data:image/%1;base64,%2")
+    return TQString::tqfromLatin1("data:image/%1;base64,%2")
            .arg( fmt, KCodecs::base64Encode( ba ) );
   }
 
@@ -882,7 +882,7 @@ namespace KMail {
 	    strategy = HeaderStrategy::brief();
 
 	// The direction of the header is determined according to the direction
-	// of the application layout.
+	// of the application tqlayout.
 
 	TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ;
 
@@ -901,7 +901,7 @@ namespace KMail {
 	// colors depend on if its encapsulated or not
         TQColor fontColor(Qt::white);
 	TQString linkColor = "class =\"white\"";
-	const TQColor activeColor = qApp->palette().active().highlight();
+	const TQColor activeColor = tqApp->palette().active().highlight();
 	TQColor activeColorDark = activeColor.dark(130);
         // reverse colors for encapsulated
         if( !topLevel ){