1 files changed, 22 insertions, 22 deletions

diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp
index 8d81179..e873bbc 100644
--- a/kradio3/src/aboutwidget.cpp
+++ b/kradio3/src/aboutwidget.cpp
@@ -25,13 +25,13 @@
 #include <tqframe.h>
 #include <kaboutdialog.h>
 #include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabbar.h>
 #include <tqimage.h>
 
 #include <kglobalsettings.h>
 #include <ktextbrowser.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <klocale.h>
@@ -45,8 +45,8 @@ class KRadioAboutTabWidget : public TQTabWidget
 {
 public:
     KRadioAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
-    TQSize tqsizeHint() const {
-    return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) );
+    TQSize sizeHint() const {
+    return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) );
     }
 };
 
@@ -75,7 +75,7 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int layoutType
   if( layoutType & AbtTitle )
   {
     mTitleLabel = new TQLabel( this, "title" );
-    mTitleLabel->tqsetAlignment(AlignCenter);
+    mTitleLabel->setAlignment(AlignCenter);
     mTopLayout->addWidget( mTitleLabel );
     mTopLayout->addSpacing( KDialog::spacingHint() );
   }
@@ -190,9 +190,9 @@ void KRadioAboutWidget::show( void )
     TQWidget::show();
 }
 
-TQSize KRadioAboutWidget::tqsizeHint( void ) const
+TQSize KRadioAboutWidget::sizeHint( void ) const
 {
-    return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) );
+    return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
 }
 
 void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ )
@@ -211,7 +211,7 @@ void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ )
     f.setBold( true );
     mVersionLabel->setFont(f);
     mAuthorLabel->setFont(f);
-    mVersionLabel->parentWidget()->tqlayout()->activate();
+    mVersionLabel->parentWidget()->layout()->activate();
   }
 
   update();
@@ -279,7 +279,7 @@ KAboutContainer *KRadioAboutWidget::addContainerPage( const TQString &title,
 {
   if( mPageTab == 0 )
   {
-    kdDebug(291) << "addPage: " << i18n("Invalid tqlayout") << endl;
+    kdDebug(291) << "addPage: " << i18n("Invalid layout") << endl;
     return 0;
   }
 
@@ -309,7 +309,7 @@ KAboutContainer *KRadioAboutWidget::addScrolledContainerPage(
 {
   if( mPageTab == 0 )
   {
-    kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "addPage: " << "Invalid layout" << endl;
     return 0;
   }
 
@@ -338,7 +338,7 @@ TQFrame *KRadioAboutWidget::addEmptyPage( const TQString &title )
 {
   if( mPageTab == 0 )
   {
-    kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "addPage: " << "Invalid layout" << endl;
     return 0;
   }
 
@@ -376,7 +376,7 @@ void KRadioAboutWidget::setTitle( const TQString &title )
 {
   if( mTitleLabel == 0 )
   {
-    kdDebug(291) << "setTitle: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "setTitle: " << "Invalid layout" << endl;
     return;
   }
   mTitleLabel->setText(title);
@@ -387,7 +387,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName )
 {
   if( mImageLabel == 0 )
   {
-    kdDebug(291) << "setImage: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "setImage: " << "Invalid layout" << endl;
     return;
   }
   if( fileName.isNull() )
@@ -402,7 +402,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName )
     pix = logo;
     mImageLabel->setPixmap( pix );
   }
-  mImageFrame->tqlayout()->activate();
+  mImageFrame->layout()->activate();
 
 }
 
@@ -441,18 +441,18 @@ void KRadioAboutWidget::setProduct( const TQString &appName,
 {
   if( mIconLabel == 0 )
   {
-    kdDebug(291) << "setProduct: " << "Invalid tqlayout" << endl;
+    kdDebug(291) << "setProduct: " << "Invalid layout" << endl;
     return;
   }
 
   if ( kapp )
       mIconLabel->setPixmap( kapp->icon() );
 
-  TQString msg1 = i18n("%1 %2 (Using KDE %3)").tqarg(appName).
-    arg(TQString::tqfromLatin1(KRADIO_VERSION)).
-    arg(TQString::tqfromLatin1(TDE_VERSION_STRING));
-  TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").tqarg('�').tqarg(year).
-    arg(author) : TQString::tqfromLatin1("");
+  TQString msg1 = i18n("%1 %2 (Using KDE %3)").arg(appName).
+    arg(TQString::fromLatin1(KRADIO_VERSION)).
+    arg(TQString::fromLatin1(TDE_VERSION_STRING));
+  TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").arg('�').arg(year).
+    arg(author) : TQString::fromLatin1("");
 
   mVersionLabel->setText( msg1 );
   mAuthorLabel->setText( msg2 );
@@ -461,7 +461,7 @@ void KRadioAboutWidget::setProduct( const TQString &appName,
     mAuthorLabel->hide();
   }
 
-  mIconLabel->parentWidget()->tqlayout()->activate();
+  mIconLabel->parentWidget()->layout()->activate();
 }
 
 
@@ -563,7 +563,7 @@ void KRadioAboutWidget::setAboutData(const KAboutData &_aboutData)
         TQLabel *label = new TQLabel(KAboutData::aboutTranslationTeam(),
                                    translatorPage);
         label->adjustSize();
-        label->setMinimumSize(label->tqsizeHint());
+        label->setMinimumSize(label->sizeHint());
         translatorPage->addWidget(label);
     }