TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

1 files changed, 21 insertions, 21 deletions

diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index e4a7e16a..490366d1 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -29,18 +29,18 @@
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
+  KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString configFile)
   {
     KGlobal::locale()->insertCatalogue("artscontrol");
     return new ArtsControlApplet(configFile, KPanelApplet::Normal,
                       KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/,
-                      parent, "artscontrolapplet");
+                      tqparent, "artscontrolapplet");
   }
 }
 
-ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name)
+ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) : KPanelApplet(configFile, type, actions, tqparent, name)
 {
-	//kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<parent<<", const char* "<<name<<" )"<<endl;
+	//kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<tqparent<<", const char* "<<name<<" )"<<endl;
 	// Get the current application configuration handle
 	ksConfig = config();
 
@@ -48,20 +48,20 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int
 	if( !p->barts ) KMessageBox::information(0, i18n("Something with the ArtsServer went wrong. You probably need to restart aRts and then reload this applet."));
 	setCustomMenu(p->menu);
 
-	p->layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
-	p->layout->setSpacing( 2 );
+	p->tqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
+	p->tqlayout->setSpacing( 2 );
 
 	if( p->barts ) {
 		p->vu = Arts::StereoVolumeControlGui( p->volume );
 		p->vu.label().fontsize( 8 );
 		p->vuw = new KArtsWidget( p->vu, this );
 		p->vuw->setMinimumSize( 16,16 );
-		p->layout->addWidget( p->vuw );
+		p->tqlayout->addWidget( p->vuw );
 	}
 
-	p->layout->activate();
+	p->tqlayout->activate();
 
-	TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) );
+	TQTimer::singleShot( 100, this, TQT_SLOT( supdatetqlayout() ) );
 
 kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl;
 }
@@ -93,12 +93,12 @@ kdDebug()<<k_funcinfo<<endl;
 
 int ArtsControlApplet::widthForHeight( int h ) const {
 kdDebug()<<"ArtsControlApplet::widthForHeight( int "<<h<<" )"<<endl;
-	return p->layout->sizeHint().width();
+	return p->tqlayout->tqsizeHint().width();
 }
 
 int ArtsControlApplet::heightForWidth( int w ) const {
 kdDebug()<<"ArtsControlApplet::heightForWidth( int "<<w<<" )"<<endl;
-	return p->layout->sizeHint().height();
+	return p->tqlayout->tqsizeHint().height();
 }
 
 void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) {
@@ -122,12 +122,12 @@ kdDebug()<<k_funcinfo<<" position()="<<position()<<endl;
 	{
 		case pTop:
 		case pBottom:
-			p->layout->setDirection( TQBoxLayout::LeftToRight );
+			p->tqlayout->setDirection( TQBoxLayout::LeftToRight );
 			if ( p->barts ) p->vu.direction( Arts::LeftToRight );
 			break;
 		case pRight:
 		case pLeft:
-			p->layout->setDirection( TQBoxLayout::TopToBottom );
+			p->tqlayout->setDirection( TQBoxLayout::TopToBottom );
 			if ( p->barts ) p->vu.direction( Arts::TopToBottom );
 			break;
 		default: break;
@@ -140,23 +140,23 @@ kdDebug() << k_funcinfo << endl;
 		svinline = new FFTScopeView( arts->server(), _parent );
 		svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
 		connect( svinline, TQT_SIGNAL( closed() ), this, TQT_SLOT( SVinline() ) );
-		layout->addWidget( svinline );
+		tqlayout->addWidget( svinline );
 	} else {
 		delete svinline;
 		svinline = 0;
 	}
-	_parent->supdatelayout();
+	_parent->supdatetqlayout();
 }
 
 void ArtsControlAppletPrivate::moreBars() { vu.left().count( vu.left().count()+10 ); vu.right().count( vu.right().count()+10 ); }
 void ArtsControlAppletPrivate::lessBars() { vu.left().count( vu.left().count()-10 ); vu.right().count( vu.right().count()-10 ); }
 
-void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleFireBars()   { vu.left().style( Arts::lmFireBars   ); vu.right().style( Arts::lmFireBars   ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleLineBars()   { vu.left().style( Arts::lmLineBars   ); vu.right().style( Arts::lmLineBars   ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleLEDs()       { vu.left().style( Arts::lmLEDs       ); vu.right().style( Arts::lmLEDs       ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleAnalog()     { vu.left().style( Arts::lmAnalog     ); vu.right().style( Arts::lmAnalog     ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleSmall()      { vu.left().style( Arts::lmSmall      ); vu.right().style( Arts::lmSmall      ); _parent->supdatelayout(); }
+void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleFireBars()   { vu.left().style( Arts::lmFireBars   ); vu.right().style( Arts::lmFireBars   ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleLineBars()   { vu.left().style( Arts::lmLineBars   ); vu.right().style( Arts::lmLineBars   ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleLEDs()       { vu.left().style( Arts::lmLEDs       ); vu.right().style( Arts::lmLEDs       ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleAnalog()     { vu.left().style( Arts::lmAnalog     ); vu.right().style( Arts::lmAnalog     ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleSmall()      { vu.left().style( Arts::lmSmall      ); vu.right().style( Arts::lmSmall      ); _parent->supdatetqlayout(); }
 
 // vim: sw=4 ts=4
 #include "artscontrolapplet.moc"