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

diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h
index 638d0d9a..64c41c0b 100644
--- a/arts/tools/levelmeters.h
+++ b/arts/tools/levelmeters.h
@@ -44,8 +44,9 @@ inline float DBToLevel(float db) {
  */
 class ACLevelMeter : public TQFrame {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	ACLevelMeter(TQWidget *parent): TQFrame(parent) {}
+	ACLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {}
 public slots:
 	virtual void setValue(float f) = 0;
 };
@@ -55,8 +56,9 @@ public slots:
  */
 class StereoLevelMeter : public TQFrame {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	StereoLevelMeter(TQWidget *parent): TQFrame(parent) {}
+	StereoLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {}
 public slots:
 	virtual void setValues(float left, float right) = 0;
 };
@@ -67,6 +69,7 @@ public slots:
  */
 class PeakBar : public ACLevelMeter {
 	Q_OBJECT
+  TQ_OBJECT
 	bool clipped;
 
 protected:
@@ -89,9 +92,9 @@ protected:
 	void frameChanged();
 	
 public:
-	PeakBar(TQWidget *parent);
+	PeakBar(TQWidget *tqparent);
 	
-	TQSize sizeHint() const;
+	TQSize tqsizeHint() const;
 
 	void drawContents(TQPainter *p);
 	virtual void setValue(float f);
@@ -102,15 +105,16 @@ public:
  */
 class ScaleView : public TQFrame {
 	Q_OBJECT
+  TQ_OBJECT
 protected:
 	TQFont font;
 	int dbRange;
 	int upperMargin, lowerMargin;
 public:
-	ScaleView(TQWidget *parent);
+	ScaleView(TQWidget *tqparent);
 	void setDbRange(int db);
 	void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; }
-	TQSize sizeHint() const;
+	TQSize tqsizeHint() const;
 	void drawContents(TQPainter *p);
 };
 
@@ -121,13 +125,14 @@ public:
  */
 class PeakLevelMeters : public StereoLevelMeter {
 	Q_OBJECT
+  TQ_OBJECT
 protected:
 	int dbRange;
 	PeakBar left, right;
 	ScaleView scaleView;
 
 public:
-	PeakLevelMeters(TQWidget *parent);
+	PeakLevelMeters(TQWidget *tqparent);
 
 public slots:
 	void setValues(float leftVal, float rightVal);
@@ -143,11 +148,12 @@ class KLed;
  */
 class LedMeter : public ACLevelMeter {
 	Q_OBJECT
+  TQ_OBJECT
 protected:
 	KLed *leds[12];
 
 public:
-	LedMeter(TQWidget *parent, bool blueState = false);
+	LedMeter(TQWidget *tqparent, bool blueState = false);
 	void setValue(float f);
 };
 
@@ -156,11 +162,12 @@ public:
  */
 class StereoLedMeters : public StereoLevelMeter {
 	Q_OBJECT
+  TQ_OBJECT
 protected:
 	LedMeter left, right;
 	
 public:
-	StereoLedMeters(TQWidget *parent);
+	StereoLedMeters(TQWidget *tqparent);
 public slots:
 	void setValues(float left, float right);
 };