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

1 files changed, 5 insertions, 5 deletions

diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index 5b56e2919..36e71a2f9 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -57,7 +57,7 @@ using namespace KABC;
 #include <tqcombobox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 #include <tqwidgetstack.h>
@@ -84,7 +84,7 @@ namespace KMail {
     TQPushButton * mFromFileBtn;
     TQPushButton * mFromAddrbkBtn;
 
-    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" );
+    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" );
     hlay = new TQHBoxLayout( vlay );
 
     // "enable X-Face" checkbox:
@@ -147,7 +147,7 @@ namespace KMail {
     mFromFileBtn = new TQPushButton( i18n("Select File..."), page );
     TQWhatsThis::add( mFromFileBtn,
                      i18n("Use this to select an image file to create the picture from. "
-                         "The image should be of high contrast and nearly quadratic tqshape. "
+                         "The image should be of high contrast and nearly quadratic shape. "
                          "A light background helps improve the result." ) );
     mFromFileBtn->setAutoDefault( false );
     page_vlay->addWidget( mFromFileBtn, 1 );
@@ -165,7 +165,7 @@ namespace KMail {
         "monochrome picture with every message. "
         "For example, this could be a picture of you or a glyph. "
         "It is shown in the recipient's mail client (if supported)." ), page );
-    label1->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+    label1->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
     page_vlay->addWidget( label1 );
 
     widgetStack->raiseWidget( 0 ); // since mSourceCombo->currentItem() == 0
@@ -266,7 +266,7 @@ namespace KMail {
     TQString str = mTextEdit->text();
     if ( !str.isEmpty() )
     {
-      if ( str.tqstartsWith("x-face:", false) )
+      if ( str.startsWith("x-face:", false) )
       {
         str = str.remove("x-face:", false);
         mTextEdit->setText(str);