Rename old tq methods that no longer need a unique name

1 files changed, 13 insertions, 13 deletions

diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 505bd6128..e7eee3445 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1027,14 +1027,14 @@ void KMReaderWin::contacStatusChanged( const TQString &uid)
 //  kdDebug( 5006 ) << k_funcinfo << " got a presence change for " << uid << endl;
   // get the list of nodes for this contact from the htmlView
   DOM::NodeList presenceNodes = mViewer->htmlDocument()
-    .getElementsByName( DOM::DOMString( TQString::tqfromLatin1("presence-") + uid ) );
+    .getElementsByName( DOM::DOMString( TQString::fromLatin1("presence-") + uid ) );
   for ( unsigned int i = 0; i < presenceNodes.length(); ++i ) {
     DOM::Node n =  presenceNodes.item( i );
     kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl;
     kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl;
     TQString newPresence = kmkernel->imProxy()->presenceString( uid );
     if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString() )
-      newPresence = TQString::tqfromLatin1( "ENOIMRUNNING" );
+      newPresence = TQString::fromLatin1( "ENOIMRUNNING" );
     n.firstChild().setNodeValue( newPresence );
 //    kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl;
   }
@@ -1976,7 +1976,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
     menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 );
   if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange )
     menu->insertItem(SmallIcon("editdelete"), i18n("Delete Attachment"), 7 );
-  if ( name.tqendsWith( ".xia", false ) &&
+  if ( name.endsWith( ".xia", false ) &&
        Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) )
     menu->insertItem( i18n( "Decrypt With Chiasmus..." ), 6 );
   menu->insertItem(i18n("Properties"), 5);
@@ -2000,9 +2000,9 @@ void KMReaderWin::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( tqstyle().isA("KeramikStyle") )
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != mBox->lineWidth() )
@@ -2267,7 +2267,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
   // determine the MIME type of the attachment
   KMimeType::Ptr mimetype;
   // prefer the value of the Content-Type header
-  mimetype = KMimeType::mimeType( TQString::tqfromLatin1( contentTypeStr ) );
+  mimetype = KMimeType::mimeType( TQString::fromLatin1( contentTypeStr ) );
   if ( mimetype->name() == "application/octet-stream" ) {
     // consider the filename if Content-Type is application/octet-stream
     mimetype = KMimeType::findByPath( name, 0, true /* no disk access */ );
@@ -2297,7 +2297,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
                        .tqarg( filenameText );
   const int choice = KMessageBox::questionYesNoCancel( this, text,
       i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text,
-      TQString::tqfromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
+      TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
 
   if( choice == KMessageBox::Yes ) {		// Save
     mAtmUpdate = true;
@@ -2828,7 +2828,7 @@ void KMReaderWin::scrollToAttachment( const partNode *node )
   DOM::Document doc = mViewer->htmlDocument();
 
   // The anchors for this are created in ObjectTreeParser::parseObjectTree()
-  mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).tqarg( node->nodeId() ) );
+  mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).tqarg( node->nodeId() ) );
 
   // Remove any old color markings which might be there
   const partNode *root = node->topLevelParent();
@@ -2889,7 +2889,7 @@ void KMReaderWin::injectAttachments()
     link += "<div style=\"text-align: left;\"><a href=\"" + urlHandle + "\"><img src=\"" +
             imgpath + imgSrc + "\"/></a></div>";
     html.prepend( link );
-    html.prepend( TQString::tqfromLatin1( "<div style=\"float:left;\">%1&nbsp;</div>" ).
+    html.prepend( TQString::fromLatin1( "<div style=\"float:left;\">%1&nbsp;</div>" ).
                   arg( i18n( "Attachments:" ) ) );
   } else {
     link += "<div style=\"text-align: right;\"><a href=\"" + urlHandle + "\"><img src=\"" +
@@ -2930,7 +2930,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
       if ( headerStyle() == HeaderStyle::enterprise() )
         align = "right";
       if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode )
-        html += TQString::tqfromLatin1("<div style=\"background:%1; %2"
+        html += TQString::fromLatin1("<div style=\"background:%1; %2"
                 "vertical-align:middle; float:%3; %4\">").tqarg( bgColor.name() ).tqarg( margin )
                                                          .tqarg( align ).tqarg( visibility );
       html += subHtml;
@@ -2941,11 +2941,11 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
     partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo();
     if ( info.displayInHeader ) {
       html += "<div style=\"float:left;\">";
-      html += TQString::tqfromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).tqarg( bgColor.name() );
+      html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).tqarg( bgColor.name() );
       TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() );
       TQString href = node->asHREF( "header" );
-      html += TQString::tqfromLatin1( "<a href=\"" ) + href +
-              TQString::tqfromLatin1( "\">" );
+      html += TQString::fromLatin1( "<a href=\"" ) + href +
+              TQString::fromLatin1( "\">" );
       html += "<img style=\"vertical-align:middle;\" src=\"" + info.icon + "\"/>&nbsp;";
       if ( headerStyle() == HeaderStyle::enterprise() ) {
         TQFont bodyFont = mCSSHelper->bodyFont( isFixedFont() );