TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 4 insertions, 2 deletions

diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index c6ec47b..887ebb4 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -53,9 +53,10 @@ class MediaControlToolTip;
 class TrayButton : public SimpleButton
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		TrayButton(TQWidget* parent, const char* name);
+		TrayButton(TQWidget* tqparent, const char* name);
 		virtual ~TrayButton() {}
 		void setIconSet(const TQIconSet &iconSet);
 };
@@ -65,6 +66,7 @@ class TrayButton : public SimpleButton
 class MediaControl : public KPanelApplet, virtual public MediaControlIface
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		MediaControl(const TQString&, Type, int ,TQWidget * = 0, const char * = 0);
@@ -93,7 +95,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface
 		TrayButton *stop_button;  // Stop the music
 		TrayButton *next_button;  // GoTo Next Playlist-Item
 		MCSlider *time_slider;
-		int mLastLen, mLastTime, mLastStatus;
+		int mLastLen, mLastTime, mLasttqStatus;
 		KPopupMenu *rmbMenu;
 
 		virtual void mousePressEvent(TQMouseEvent* e);