Rename old tq methods that no longer need a unique name

4 files changed, 16 insertions, 16 deletions

diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
index 62dc3a5..e392dca 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -50,7 +50,7 @@ MLabel::MLabel( TQWidget *parent ) : TQLabel( parent )
 void MLabel::paintEvent( TQPaintEvent *pe )
 {
 	TQLabel::paintEvent( pe );
-	TQColorGroup cg = parentWidget()->tqcolorGroup();
+	TQColorGroup cg = parentWidget()->colorGroup();
 	TQColor base = cg.base();
 	TQColor selection = cg.highlight();
 	int r = (base.red() + selection.red()) / 2;
@@ -76,22 +76,22 @@ void MListView::resizeEvent( TQResizeEvent *rev )
 Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name)
 {
 	mainWidget = new TQVBox( parent );
-	mainWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+	mainWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
 	split = new TQSplitter( mainWidget );
 	split->setOpaqueResize( true );
 	widg = new TQWidget( split );
 	widg->setMinimumWidth( 200 );
-	widg->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+	widg->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
 	TQVBoxLayout *wb = new TQVBoxLayout( widg, 0, 0 );
 	discLab = new MLabel( widg );
 	wb->addWidget( discLab );
 	playerBox = new TQVBox( widg );
 	wb->addWidget( playerBox );
 	playerBox->setMinimumWidth( 200 );
-	playerBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+	playerBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
 	panel = new TQFrame( split );
 	split->moveToFirst( panel );
-	panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+	panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
 	split->setResizeMode( panel, TQSplitter::KeepSize );
 
 	TQVBoxLayout *vb = new TQVBoxLayout( panel, 3, 3 );
@@ -99,13 +99,13 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	cdBtn->setTextLabel( i18n("Play CD") );
 	cdBtn->setTextPosition( TQToolButton::Under );
 	cdBtn->setUsesTextLabel( true );
-	cdBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+	cdBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 	TQToolTip::add( cdBtn, i18n("Play CD"));
 	ripBtn = new TQToolButton( panel );
 	ripBtn->setTextLabel( i18n("Rip CD") );
 	ripBtn->setTextPosition( TQToolButton::Under );
 	ripBtn->setUsesTextLabel( true );
-	ripBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+	ripBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 	TQToolTip::add( ripBtn, i18n("Rip CD"));
 
 	TQHBoxLayout *h1 = new TQHBoxLayout();
@@ -124,7 +124,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	artistLab = new TQLabel( "", panel );
 	artistLab->setLineWidth(1);
 	artistLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
-	artistLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+	artistLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
 	h1->addWidget( artistLab );
 	vb->addLayout( h1 );
 	h1 = new TQHBoxLayout();
@@ -132,7 +132,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	albumLab = new TQLabel( "", panel );
 	albumLab->setLineWidth(1);
 	albumLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
-	albumLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+	albumLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
 	h1->addWidget( albumLab );
 	vb->addLayout( h1 );
 
@@ -161,7 +161,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	enc->setTextPosition( TQToolButton::Under );
 	enc->setUsesTextLabel( true );
 	enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) );
-	enc->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+	enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) );
 	vb->addWidget( encodeWidget );
 	encodeWidget->hide();
diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui
index e20c98f..1d163d3 100644
--- a/kaffeine/src/input/disc/paranoiasettings.ui
+++ b/kaffeine/src/input/disc/paranoiasettings.ui
@@ -165,7 +165,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>60</height>
@@ -190,7 +190,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>152</width>
                                     <height>20</height>
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
index 09a2a87..d956e5b 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
+++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
@@ -108,7 +108,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -133,7 +133,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>107</width>
                                     <height>20</height>
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
index b07342a..b243300 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
@@ -98,7 +98,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>81</height>
@@ -123,7 +123,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>157</width>
                                     <height>20</height>