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, 5 insertions, 4 deletions

diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h
index 947ce81e..5c363428 100644
--- a/noatun/modules/winskin/waSkin.h
+++ b/noatun/modules/winskin/waSkin.h
@@ -33,7 +33,7 @@ class WaMain;
 class WaIndicator;
 class WaTitleBar;
 class WaClutterbar;
-class WaStatus;
+class WatqStatus;
 
 class WaJumpSlider;
 class WaVolumeSlider;
@@ -45,7 +45,8 @@ class WaSkin;
 extern WaSkin *_waskin_instance;
 
 class WaSkin : public TQWidget, public UserInterface {
-  Q_OBJECT 
+  Q_OBJECT
+  TQ_OBJECT 
   NOATUNPLUGIND
     WaSkinModel *waSkinModel;
     WaSkinManager *waSkinManager;
@@ -59,7 +60,7 @@ class WaSkin : public TQWidget, public UserInterface {
     void loadSkin(TQString skinDir);
     void setChannels(int val);
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     static TQString defaultSkin();
     static WaSkin *instance() { return _waskin_instance; }
@@ -158,7 +159,7 @@ class WaSkin : public TQWidget, public UserInterface {
     WaLabel *waFreq;
 
     WaInfo *waInfo;
-    WaStatus *waStatus;
+    WatqStatus *watqStatus;
     WaIndicator *waStereo;
     WaIndicator *waMono;