Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kradio@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

20 files changed, 35 insertions, 35 deletions

diff --git a/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui b/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
index 7faf941..ebdd9a1 100644
--- a/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
+++ b/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
@@ -263,7 +263,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="2"/>
+<layoutdefaults spacing="6" margin="2"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui b/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
index f0f9535..c15e91d 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
+++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
@@ -311,7 +311,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
index 419fd10..23b8e14 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
@@ -63,8 +63,8 @@ ButtonFlowLayout::ButtonFlowLayout( TQWidget *tqparent, int margin, int spacing,
 {
 }
 
-ButtonFlowLayout::ButtonFlowLayout( TQLayout* tqparentLayout, int spacing, const char *name )
-  : TQLayout( tqparentLayout, spacing, name ),
+ButtonFlowLayout::ButtonFlowLayout( TQLayout* parentLayout, int spacing, const char *name )
+  : TQLayout( parentLayout, spacing, name ),
   cached_width(0)
 {
 }
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.h b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
index 624688e..16a0b45 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.h
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
@@ -32,7 +32,7 @@ public:
     ButtonFlowLayout( TQWidget *tqparent, int margin = 0, int spacing=-1,
                       const char *name=0 );
 
-    ButtonFlowLayout( TQLayout* tqparentLayout, int spacing=-1, const char *name=0 );
+    ButtonFlowLayout( TQLayout* parentLayout, int spacing=-1, const char *name=0 );
 
     ButtonFlowLayout( int spacing=-1, const char *name=0 );
 
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
index 53f3a37..b0db2bd 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
@@ -182,9 +182,9 @@ bool RadioViewFrequencyRadio::setDisplayColors(const TQColor &activeText,
     pl.setActive(ncg);
     setPalette(pl);
 
-    if (tqparentWidget() && tqparentWidget()->backgroundPixmap() ){
+    if (parentWidget() && parentWidget()->backgroundPixmap() ){
         KPixmapIO io;
-        TQImage  i = io.convertToImage(*tqparentWidget()->backgroundPixmap());
+        TQImage  i = io.convertToImage(*parentWidget()->backgroundPixmap());
         KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark));
         setPaletteBackgroundPixmap(io.convertToPixmap(i));
         setBackgroundOrigin(WindowOrigin);
diff --git a/kradio3/plugins/gui-standard-display/radioview_seekinterface.ui b/kradio3/plugins/gui-standard-display/radioview_seekinterface.ui
index 0b15331..29542f9 100644
--- a/kradio3/plugins/gui-standard-display/radioview_seekinterface.ui
+++ b/kradio3/plugins/gui-standard-display/radioview_seekinterface.ui
@@ -163,5 +163,5 @@
     <function>destroy()</function>
 </functions>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kradio3/plugins/lirc/lirc-configuration-ui.ui b/kradio3/plugins/lirc/lirc-configuration-ui.ui
index 468f4dc..56b39de 100644
--- a/kradio3/plugins/lirc/lirc-configuration-ui.ui
+++ b/kradio3/plugins/lirc/lirc-configuration-ui.ui
@@ -103,7 +103,7 @@
 <customwidgets>
 </customwidgets>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kradio3/plugins/oss-sound/oss-sound-configuration-ui.ui b/kradio3/plugins/oss-sound/oss-sound-configuration-ui.ui
index 12f3051..422924f 100644
--- a/kradio3/plugins/oss-sound/oss-sound-configuration-ui.ui
+++ b/kradio3/plugins/oss-sound/oss-sound-configuration-ui.ui
@@ -119,7 +119,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kradio3/plugins/radio/radio-configuration-ui.ui b/kradio3/plugins/radio/radio-configuration-ui.ui
index e56fc37..3d538c7 100644
--- a/kradio3/plugins/radio/radio-configuration-ui.ui
+++ b/kradio3/plugins/radio/radio-configuration-ui.ui
@@ -764,7 +764,7 @@
     <include location="global" impldecl="in implementation">src/include/radiostation-listview.h</include>
 </includes>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>src/include/radiostation-listview.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/kradio3/plugins/recording/recording-configuration-ui.ui b/kradio3/plugins/recording/recording-configuration-ui.ui
index 6d25321..e5ba41c 100644
--- a/kradio3/plugins/recording/recording-configuration-ui.ui
+++ b/kradio3/plugins/recording/recording-configuration-ui.ui
@@ -716,7 +716,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kradio3/plugins/recording/recording-datamonitor.cpp b/kradio3/plugins/recording/recording-datamonitor.cpp
index c34ab0a..797ca9c 100644
--- a/kradio3/plugins/recording/recording-datamonitor.cpp
+++ b/kradio3/plugins/recording/recording-datamonitor.cpp
@@ -220,9 +220,9 @@ bool RecordingDataMonitor::setColors(const TQColor &activeText,
     pl.setActive(ncg);
     setPalette(pl);
 
-    if (tqparentWidget() && tqparentWidget()->backgroundPixmap() ){
+    if (parentWidget() && parentWidget()->backgroundPixmap() ){
         KPixmapIO io;
-        TQImage  i = io.convertToImage(*tqparentWidget()->backgroundPixmap());
+        TQImage  i = io.convertToImage(*parentWidget()->backgroundPixmap());
         KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark));
         setPaletteBackgroundPixmap(io.convertToPixmap(i));
         setBackgroundOrigin(WindowOrigin);
diff --git a/kradio3/plugins/streaming/streaming-configuration-ui.ui b/kradio3/plugins/streaming/streaming-configuration-ui.ui
index cadd4a7..884e03c 100644
--- a/kradio3/plugins/streaming/streaming-configuration-ui.ui
+++ b/kradio3/plugins/streaming/streaming-configuration-ui.ui
@@ -762,7 +762,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>klistview.h</includehint>
diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
index c020ed4..15ecc20 100644
--- a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
+++ b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
@@ -445,7 +445,7 @@
     <include location="global" impldecl="in implementation">kiconloader.h</include>
 </includes>
 <pixmapfunction>SmallIcon</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>klistbox.h</includehint>
 </includehints>
diff --git a/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui b/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
index 8647873..2020bbc 100644
--- a/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
+++ b/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
@@ -221,5 +221,5 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 </UI>
diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
index 165ebfa..06550c7 100644
--- a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
+++ b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
@@ -951,7 +951,7 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>ktabwidget.h</includehint>
     <includehint>knuminput.h</includehint>
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>