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, 9 insertions, 8 deletions

diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 2b681b92..2f7c553d 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -47,11 +47,12 @@ class VolumeSlider;
 
 class KDE_EXPORT ArtsControlAppletPrivate : public TQObject {
    Q_OBJECT
+  TQ_OBJECT
 private:
 	ArtsControlApplet *_parent;
 	ArtsActions* _artsactions;
 public:
-	TQBoxLayout *layout;
+	TQBoxLayout *tqlayout;
 	KArtsServer *arts;
 	KArtsDispatcher *dispatcher;
 	Arts::StereoVolumeControl volume;
@@ -62,12 +63,12 @@ public:
 	Arts::StereoVolumeControlGui vu;
 
 	KPopupMenu *menu;
-	KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
+	KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
 	KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall;
 
-	ArtsControlAppletPrivate( ArtsControlApplet *parent )
-	    : TQObject(parent)
-	    , _parent( parent )
+	ArtsControlAppletPrivate( ArtsControlApplet *tqparent )
+	    : TQObject(tqparent)
+	    , _parent( tqparent )
 	    , barts( false )
 	    , bInUpdate( false )
 	{
@@ -77,7 +78,7 @@ public:
 		if( barts ) volume = arts->server().outVolume();
 		svinline=0;
 
-		_artsactions = new ArtsActions( arts, 0, parent );
+		_artsactions = new ArtsActions( arts, 0, tqparent );
 
 		menu = new KPopupMenu( 0 );
 		_showSV = _artsactions->actionScopeView();
@@ -86,8 +87,8 @@ public:
 		_showSVinline->plug( menu );
 		_showAM = _artsactions->actionAudioManager();
 		_showAM->plug( menu );
-		_showArtsStatus = _artsactions->actionArtsStatusView();
-		_showArtsStatus->plug( menu );
+		_showArtstqStatus = _artsactions->actionArtsStatusView();
+		_showArtstqStatus->plug( menu );
 		_showMidiManager = _artsactions->actionMidiManagerView();
 		_showMidiManager->plug( menu );
 		_showEnvironment = _artsactions->actionEnvironmentView();