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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 24 insertions, 24 deletions

diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 37f07d475..9e74cbb6d 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -16,15 +16,15 @@
 #include <sys/stat.h>
 
 #include <tqbuffer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqpopupmenu.h>
 #include <tqstringlist.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqtimer.h>
 
 #include <kaction.h>
@@ -290,9 +290,9 @@ void ArticleWidget::readConfig()
   mAttachmentStyle = conf->readEntry( "attachmentStyle", "inline" );
   mHeaderStyle = conf->readEntry( "headerStyle", "fancy" );
   KRadioAction *ra = 0;
-  ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").arg(mAttachmentStyle).latin1() ) );
+  ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").tqarg(mAttachmentStyle).latin1() ) );
   ra->setChecked( true );
-  ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").arg(mHeaderStyle).latin1() ) );
+  ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").tqarg(mHeaderStyle).latin1() ) );
   ra->setChecked( true );
 
   delete mCSSHelper;
@@ -402,7 +402,7 @@ void ArticleWidget::displayArticle()
   // check if codec is available
   if ( text && !canDecodeText( text->contentType()->charset() ) ) {
     html += TQString("<table width=\"100%\" border=\"0\"><tr><td bgcolor=\"#FF0000\">%1</td></tr></table>")
-      .arg( i18n("Unknown charset. Default charset is used instead.") );
+      .tqarg( i18n("Unknown charset. Default charset is used instead.") );
     kdDebug(5003) << k_funcinfo << "unknown charset = " << text->contentType()->charset() << endl;
   }
 
@@ -560,8 +560,8 @@ void ArticleWidget::displayHeader()
       if ( header ) {
         headerHtml += "<tr>";
         headerHtml+=TQString( "<td align=\"right\" valign=\"top\"><b>%1</b></td><td width=\"100%\">%2</td></tr>" )
-          .arg( toHtmlString( header->type(), None ) + ": " )
-          .arg( toHtmlString( header->asUnicodeString() , ParseURL ) );
+          .tqarg( toHtmlString( header->type(), None ) + ": " )
+          .tqarg( toHtmlString( header->asUnicodeString() , ParseURL ) );
         delete header;
       }
     }
@@ -597,8 +597,8 @@ void ArticleWidget::displayHeader()
 
     if ( hb->is("From") ) {
       headerHtml += TQString( "<a href=\"mailto:%1\">%2</a>")
-          .arg( KPIM::getEmailAddress( hb->asUnicodeString() ) )
-          .arg( toHtmlString( hb->asUnicodeString(), None ) );
+          .tqarg( KPIM::getEmailAddress( hb->asUnicodeString() ) )
+          .tqarg( toHtmlString( hb->asUnicodeString(), None ) );
       KMime::Headers::Base *orgHdr = mArticle->getHeaderByType( "Organization" );
       if ( orgHdr && !orgHdr->isEmpty() ) {
         headerHtml += "&nbsp;&nbsp;(";
@@ -635,8 +635,8 @@ void ArticleWidget::displayHeader()
   TQString xface = "";
   if ( !xfhead.isEmpty() ) {
     KPIM::KXFace xf;
-    xface = TQString::fromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" )
-      .arg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) );
+    xface = TQString::tqfromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" )
+      .tqarg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) );
   }
 
   // fancy header style
@@ -660,10 +660,10 @@ void ArticleWidget::displayHeader()
     int refCnt = refs->count(), i = 1;
     TQCString id = refs->first();
     id = id.mid( 1, id.length() - 2 );  // remove <>
-    html += TQString( "<b>%1</b>" ).arg( i18n("References:") );
+    html += TQString( "<b>%1</b>" ).tqarg( i18n("References:") );
 
     while ( i <= refCnt ) {
-      html += " <a href=\"news:" + TQString::fromLatin1( id ) + "\">" + TQString::number( i ) + "</a>";
+      html += " <a href=\"news:" + TQString::tqfromLatin1( id ) + "\">" + TQString::number( i ) + "</a>";
       id = refs->next();
       id = id.mid( 1, id.length() - 2 );  // remove <>
       i++;
@@ -748,7 +748,7 @@ TQString ArticleWidget::displaySigHeader( Kpgp::Block* block )
   TQString message;
   if ( signer.isEmpty() ) {
     message = i18n( "Message was signed with unknown key 0x%1." )
-      .arg( TQString(signerKey) );
+      .tqarg( TQString(signerKey) );
     message += "<br/>";
     message += i18n( "The validity of the signature cannot be verified." );
     signClass = "signWarn";
@@ -769,10 +769,10 @@ TQString ArticleWidget::displaySigHeader( Kpgp::Block* block )
 
     if( !signerKey.isEmpty() )
       message += i18n( "Message was signed by %1 (Key ID: 0x%2)." )
-      .arg( signer )
-      .arg( TQString(signerKey) );
+      .tqarg( signer )
+      .tqarg( TQString(signerKey) );
     else
-      message += i18n( "Message was signed by %1." ).arg( signer );
+      message += i18n( "Message was signed by %1." ).tqarg( signer );
     message += "<br/>";
 
     if( block->goodSignature() ) {
@@ -915,8 +915,8 @@ TQString ArticleWidget::imgToDataUrl( const TQImage &image, const char* fmt  )
   TQBuffer buffer( ba );
   buffer.open( IO_WriteOnly );
   image.save( &buffer, fmt );
-  return TQString::fromLatin1("data:image/%1;base64,%2")
-    .arg( fmt, TQString(KCodecs::base64Encode( ba )) );
+  return TQString::tqfromLatin1("data:image/%1;base64,%2")
+    .tqarg( fmt, TQString(KCodecs::base64Encode( ba )) );
 }
 
 
@@ -1030,7 +1030,7 @@ void ArticleWidget::processJob( KNJobData * job )
     if ( !job->canceled() ) {
       if ( !job->success() )
         KMessageBox::error( this, i18n("An error occurred while downloading the article source:\n")
-          .arg( job->errorString() ) );
+          .tqarg( job->errorString() ) );
       else
         new KNSourceViewWindow( a->head() + "\n" + a->body() );
     }
@@ -1408,15 +1408,15 @@ void ArticleWidget::slotCopyURL()
     address = mCurrentURL.path();
   else
     address = mCurrentURL.url();
-  TQApplication::clipboard()->setText( address, TQClipboard::Clipboard );
-  TQApplication::clipboard()->setText( address, TQClipboard::Selection );
+  TQApplication::tqclipboard()->setText( address, TQClipboard::Clipboard );
+  TQApplication::tqclipboard()->setText( address, TQClipboard::Selection );
 }
 
 void ArticleWidget::slotAddBookmark()
 {
   if ( mCurrentURL.isEmpty() )
     return;
-  TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
+  TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
   KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename, false );
   KBookmarkGroup group = bookManager->root();
   group.addBookmark( bookManager, mCurrentURL.url(), mCurrentURL );