5 files changed, 17 insertions, 17 deletions
diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp
index 3fbba1c..4c72cd0 100644
--- a/kradio3/src/aboutwidget.cpp
+++ b/kradio3/src/aboutwidget.cpp
@@ -54,7 +54,7 @@ public:
 // copied (renamed and extended) from kaboutdialog.cpp
 // original: KAboutContainerBase
 
-KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int tqlayoutType, TQWidget *_parent,
+KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int layoutType, TQWidget *_parent,
                       char *_name )
   : TQWidget( _parent, _name ),
     mImageLabel(0), mTitleLabel(0), mIconLabel(0),mVersionLabel(0),
@@ -63,16 +63,16 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int tqlayoutTy
   mTopLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
   if( mTopLayout == 0 ) { return; }
 
-  if( tqlayoutType & AbtImageOnly )
+  if( layoutType & AbtImageOnly )
   {
-    tqlayoutType &= ~(AbtImageLeft|AbtImageRight|AbtTabbed|AbtPlain);
+    layoutType &= ~(AbtImageLeft|AbtImageRight|AbtTabbed|AbtPlain);
   }
-  if( tqlayoutType & AbtImageLeft )
+  if( layoutType & AbtImageLeft )
   {
-    tqlayoutType &= ~AbtImageRight;
+    layoutType &= ~AbtImageRight;
   }
 
-  if( tqlayoutType & AbtTitle )
+  if( layoutType & AbtTitle )
   {
     mTitleLabel = new TQLabel( this, "title" );
     mTitleLabel->tqsetAlignment(AlignCenter);
@@ -80,7 +80,7 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int tqlayoutTy
     mTopLayout->addSpacing( KDialog::spacingHint() );
   }
 
-  if( tqlayoutType & AbtProduct )
+  if( layoutType & AbtProduct )
   {
     TQWidget *productArea = new  TQWidget( this, "area" );
     mTopLayout->addWidget( productArea, 0, AlignLeft );
@@ -108,7 +108,7 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int tqlayoutTy
   if( hbox == 0 ) { return; }
   mTopLayout->addLayout( hbox, 10 );
 
-  if( tqlayoutType & AbtImageLeft )
+  if( layoutType & AbtImageLeft )
   {
     TQVBoxLayout *vbox = new TQVBoxLayout();
     hbox->addLayout(vbox);
@@ -128,13 +128,13 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int tqlayoutTy
     vbox->activate();
   }
 
-  if( tqlayoutType & AbtTabbed )
+  if( layoutType & AbtTabbed )
   {
     mPageTab = new KRadioAboutTabWidget( this );
     if( mPageTab == 0 ) { return; }
     hbox->addWidget( mPageTab, 10 );
   }
-  else if( tqlayoutType & AbtImageOnly )
+  else if( layoutType & AbtImageOnly )
   {
     mImageFrame = new TQFrame( this );
     setImageFrame( true );
@@ -159,7 +159,7 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int tqlayoutTy
     hbox->addWidget( mPlainSpace, 10 );
   }
 
-  if( tqlayoutType & AbtImageRight )
+  if( layoutType & AbtImageRight )
   {
     TQVBoxLayout *vbox = new TQVBoxLayout();
     hbox->addLayout(vbox);
@@ -211,7 +211,7 @@ void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ )
     f.setBold( true );
     mVersionLabel->setFont(f);
     mAuthorLabel->setFont(f);
-    mVersionLabel->tqparentWidget()->tqlayout()->activate();
+    mVersionLabel->parentWidget()->tqlayout()->activate();
   }
 
   update();
@@ -461,7 +461,7 @@ void KRadioAboutWidget::setProduct( const TQString &appName,
     mAuthorLabel->hide();
   }
 
-  mIconLabel->tqparentWidget()->tqlayout()->activate();
+  mIconLabel->parentWidget()->tqlayout()->activate();
 }
 
 
diff --git a/kradio3/src/include/aboutwidget.h b/kradio3/src/include/aboutwidget.h
index 3ba3573..9faf570 100644
--- a/kradio3/src/include/aboutwidget.h
+++ b/kradio3/src/include/aboutwidget.h
@@ -92,7 +92,7 @@ class KRadioAboutWidget : public TQWidget
     };
 
   public:
-    KRadioAboutWidget(const KAboutData &abtData, int tqlayoutType, TQWidget *tqparent = 0, char *name = 0);
+    KRadioAboutWidget(const KAboutData &abtData, int layoutType, TQWidget *tqparent = 0, char *name = 0);
     virtual void show( void );
     virtual TQSize tqsizeHint( void ) const;
 
diff --git a/kradio3/src/pluginmanager-configuration-ui.ui b/kradio3/src/pluginmanager-configuration-ui.ui
index 12c4824..abaa991 100644
--- a/kradio3/src/pluginmanager-configuration-ui.ui
+++ b/kradio3/src/pluginmanager-configuration-ui.ui
@@ -380,7 +380,7 @@
     <include location="global" impldecl="in implementation">kiconloader.h</include>
 </includes>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kradio3/src/standardscandialog-ui.ui b/kradio3/src/standardscandialog-ui.ui
index 47e084e..8d0e8d5 100644
--- a/kradio3/src/standardscandialog-ui.ui
+++ b/kradio3/src/standardscandialog-ui.ui
@@ -132,5 +132,5 @@
 </variables>
 <Q_SLOTS>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kradio3/src/stationselector-ui.ui b/kradio3/src/stationselector-ui.ui
index 9ef12b1..bc3f3dd 100644
--- a/kradio3/src/stationselector-ui.ui
+++ b/kradio3/src/stationselector-ui.ui
@@ -165,7 +165,7 @@
     <include location="global" impldecl="in implementation">kiconloader.h</include>
 </includes>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>radiostation-listview.h</includehint>
     <includehint>kpushbutton.h</includehint>