From f59dfa08651a47f21d004e8e4cb5020b8035287e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:25 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.
---
 kscd/kcompactdisc.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kscd/kcompactdisc.h')

diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h
index 8015ab27..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.
@@ -64,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();
 
@@ -96,7 +96,7 @@ public:
     void setVolume(unsigned volume);
 
     /**
-     * Stop playout.
+     * Stop ptqlayout.
      */
     void stop();
 
@@ -281,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;
@@ -292,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;
 
-- 
cgit v1.2.1