1 files changed, 11 insertions, 10 deletions

diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h
index f71189a8..10d5eabb 100644
--- a/kscd/kcompactdisc.h
+++ b/kscd/kcompactdisc.h
@@ -34,7 +34,7 @@
  * @see #discChanged(): A disc was inserted or removed.
  * @see #trayOpening(): A disc is being removed.
  *
- *  The progress of playout is modelled by these signals:
+ *  The progress of ptqlayout is modelled by these signals:
  *
  * @see #trackPlaying(): A track started playing, or is still playing.
  * @see #trackPaused(): A track was paused.
@@ -44,9 +44,10 @@
  *  positive numbers; zero is not a valid track number.
  */
 class KCompactDisc :
-    public QObject
+    public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum InformationMode
     {
@@ -63,12 +64,12 @@ public:
     void eject();
 
     /**
-     * Start playout at given position of track.
+     * Start ptqlayout at given position of track.
      */
     void play(unsigned startTrack = 0, unsigned startTrackPosition = 0, unsigned endTrack = 0);
 
     /**
-     * Pause/resume playout.
+     * Pause/resume ptqlayout.
      */
     void pause();
 
@@ -89,13 +90,13 @@ public:
         const TQString &device = defaultDevice,
         unsigned volume = 50,
         bool digitalPlayback = true,
-        const TQString &audioSystem = TQString::null,
-        const TQString &audioDevice = TQString::null);
+        const TQString &audioSystem = TQString(),
+        const TQString &audioDevice = TQString());
 
     void setVolume(unsigned volume);
 
     /**
-     * Stop playout.
+     * Stop ptqlayout.
      */
     void stop();
 
@@ -280,7 +281,7 @@ private:
     TQTimer timer;
     TQString m_device;
     int m_status;
-    int m_previousStatus;
+    int m_previoustqStatus;
     unsigned m_discId;
     unsigned m_previousDiscId;
     TQString m_artist;
@@ -291,8 +292,8 @@ private:
     TQStringList m_trackTitles;
     unsigned m_track;
     unsigned m_previousTrack;
-    void checkDeviceStatus();
-    TQString discStatus(int status);
+    void checkDevicetqStatus();
+    TQString disctqStatus(int status);
     class KCompactDiscPrivate *d;
     InformationMode m_infoMode;