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/kscd/kscd.h b/kscd/kscd.h
index f4903590..c6f2a8c1 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -72,6 +72,7 @@ typedef TQValueList<int> RandomList;
 class KSCD : public kscdPanelDlg, public KSessionManaged, virtual public DCOPObject {
 
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 
     // time display modes
@@ -101,16 +102,16 @@ k_dcop:
     int currentTrack();
     int currentTrackLength();
     int currentPosition();
-    int getStatus();
+    int gettqStatus();
     TQString currentTrackTitle();
     TQString currentAlbum();
     TQString currentArtist();
     TQStringList trackList();
 
 public:
-    KSCD( TQWidget *parent = 0, const char *name = 0 );
+    KSCD( TQWidget *tqparent = 0, const char *name = 0 );
     ~KSCD();
-    virtual bool saveState(QSessionManager& sm);
+    virtual bool saveState(TQSessionManager& sm);
 
     void setDocking(bool dock);
     bool digitalPlayback();
@@ -174,7 +175,7 @@ protected:
     void calculateDisplayedTime();
     void calculateDisplayedTime(int sec);
     void setSongListTo(int whichTrack);
-    void populateSongList(TQString infoStatus);
+    void populateSongList(TQString infotqStatus);
     void updatePlayPB(bool playing);
 
     void updateConfigDialog(configWidget* widget);