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, 32 insertions, 21 deletions

diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h
index 1f2bc788..6dd1fd3e 100644
--- a/noatun/modules/kaiman/style.h
+++ b/noatun/modules/kaiman/style.h
@@ -29,11 +29,12 @@
 #include <tqevent.h>
 #include <tqptrvector.h>
 
-class KaimanStyleElement : public QWidget
+class KaimanStyleElement : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleElement(TQWidget *parent, const char *name=0);
+    KaimanStyleElement(TQWidget *tqparent, const char *name=0);
     ~KaimanStyleElement();
 
     virtual void loadPixmaps(TQString &val_s_filename);
@@ -72,15 +73,16 @@ private:
 class KaimanStyleMasked : public KaimanStyleElement
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleMasked(TQWidget *parent, const char *name=0)
-        : KaimanStyleElement( parent, name ) {};
+    KaimanStyleMasked(TQWidget *tqparent, const char *name=0)
+        : KaimanStyleElement( tqparent, name ) {};
 
     virtual void loadPixmaps(TQString &val_s_filename)
         {
             KaimanStyleElement::loadPixmaps( val_s_filename );
-            if(pixmaps[0]->mask())
-                setMask(*pixmaps[0]->mask());
+            if(pixmaps[0]->tqmask())
+                setMask(*pixmaps[0]->tqmask());
         };
 };
 
@@ -88,8 +90,9 @@ public:
 class KaimanStyleButton : public KaimanStyleMasked
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleButton(TQWidget *parent, const char *name=0);
+    KaimanStyleButton(TQWidget *tqparent, const char *name=0);
     ~KaimanStyleButton();
 
     // Button states.
@@ -125,8 +128,9 @@ private:
 class KaimanStyleSlider : public KaimanStyleMasked
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0);
+    KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name=0);
     ~KaimanStyleSlider();
 
     int value() { return _value; };
@@ -163,8 +167,9 @@ protected:
 class KaimanStyleBackground : public KaimanStyleMasked
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleBackground(TQWidget *parent, const char *name=0);
+    KaimanStyleBackground(TQWidget *tqparent, const char *name=0);
     ~KaimanStyleBackground();
 
 protected:
@@ -182,8 +187,9 @@ private:
 class KaimanStyleValue : public KaimanStyleMasked
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0);
+    KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name=0);
     ~KaimanStyleValue();
 
     int value() { return _value; };
@@ -200,8 +206,9 @@ private:
 class KaimanStyleState : public KaimanStyleMasked
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleState(TQWidget *parent, const char *name=0);
+    KaimanStyleState(TQWidget *tqparent, const char *name=0);
     ~KaimanStyleState();
 
     int value() { return _value; };
@@ -223,8 +230,9 @@ private:
 class KaimanStyleNumber : public KaimanStyleElement
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleNumber(TQWidget *parent, const char *name=0);
+    KaimanStyleNumber(TQWidget *tqparent, const char *name=0);
     ~KaimanStyleNumber();
 
     virtual void loadPixmaps(TQString &val_s_filename);
@@ -247,8 +255,9 @@ private:
 class KaimanStyleText : public KaimanStyleElement
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleText(TQWidget *parent, const char *name=0);
+    KaimanStyleText(TQWidget *tqparent, const char *name=0);
     ~KaimanStyleText();
 
     virtual void loadPixmaps(TQString &val_s_filename);
@@ -281,8 +290,9 @@ private:
 class KaimanStyleAnimation : public KaimanStyleMasked
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0);
+    KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name=0);
     ~KaimanStyleAnimation();
 
 public slots:
@@ -298,25 +308,26 @@ private:
     TQTimer *_timer;
 };
 
-class KaimanStyle : public QWidget
+class KaimanStyle : public TQWidget
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-    KaimanStyle(TQWidget *parent, const char *name=0);
+    KaimanStyle(TQWidget *tqparent, const char *name=0);
     ~KaimanStyle();
 
-    enum { background, mask, play_Button, stop_Button, pause_Button, prev_Button, next_Button,  repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider };
+    enum { background, tqmask, play_Button, stop_Button, pause_Button, prev_Button, next_Button,  repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider };
 
     enum { ParsingError=1, FileNotFound };
 
     /// Finds a style element, according  to it's name. Returns 0 when element is not available.
-    KaimanStyleElement* find(const char* val_s_elemName);
+    KaimanStyleElement* tqfind(const char* val_s_elemName);
 
     /// Tries to load the given style and returns success (true) or failure (false)
     bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" );
     TQString skinName() { return i_skinName; };
 
-    /// Returns the mask
+    /// Returns the tqmask
     TQBitmap* Mask();
 
     virtual bool eventFilter( TQObject *o, TQEvent *e );
@@ -335,13 +346,13 @@ private:
     TQString     i_s_styleBase;
 
 
-    // The mask of the complete style. Used for doing shaped windows
+    // The tqmask of the complete style. Used for doing tqshaped windows
     TQBitmap     i_bitmap_Mask;
 
     /// All style elements are stored here.
     TQPtrVector<KaimanStyleElement> I_styleElem;
 
-    // The parent window. In other words: The container that holds all the KaimanStyleElement's
+    // The tqparent window. In other words: The container that holds all the KaimanStyleElement's
     TQWidget*            i_qw_parent;
 
     TQPtrList<TQWidget> i_sliders;