summaryrefslogtreecommitdiffstats
path: root/kscd/kcompactdisc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kscd/kcompactdisc.cpp')
-rw-r--r--kscd/kcompactdisc.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp
index 83a9c532..c65df07b 100644
--- a/kscd/kcompactdisc.cpp
+++ b/kscd/kcompactdisc.cpp
@@ -81,7 +81,7 @@ extern "C"
#endif
}
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <fixx11h.h>
// Our internal definition of when we have no disc. Used to guard some
@@ -100,7 +100,7 @@ const unsigned KCompactDisc::missingDisc = (unsigned)-1;
KCompactDisc::KCompactDisc(InformationMode infoMode) :
m_device(TQString()),
m_status(0),
- m_previoustqStatus(123456),
+ m_previousStatus(123456),
m_discId(missingDisc),
m_previousDiscId(0),
m_artist(TQString()),
@@ -143,7 +143,7 @@ unsigned KCompactDisc::discPosition() const
return cur_pos_abs * 1000 - FRAMES_TO_MS(m_trackStartFrames[0]);
}
-TQString KCompactDisc::disctqStatus(int status)
+TQString KCompactDisc::discStatus(int status)
{
TQString message;
@@ -282,7 +282,7 @@ bool KCompactDisc::setDevice(
<< m_device << ", "
<< (digitalPlayback ? audioSystem : TQString()) << ", "
<< (digitalPlayback ? audioDevice : TQString()) << ", status: "
- << disctqStatus(status) << endl;
+ << discStatus(status) << endl;
if (status < 0)
{
@@ -295,7 +295,7 @@ bool KCompactDisc::setDevice(
setVolume(volume);
}
- m_previoustqStatus = m_status = wm_cd_status();
+ m_previousStatus = m_status = wm_cd_status();
if (m_infoMode == Asynchronous)
timerExpired();
@@ -307,7 +307,7 @@ bool KCompactDisc::setDevice(
void KCompactDisc::setVolume(unsigned volume)
{
int status = wm_cd_volume(volume, WM_BALANCE_SYMMETRED);
- kdDebug() << "Volume change: " << volume << ", status: " << disctqStatus(status) << endl;
+ kdDebug() << "Volume change: " << volume << ", status: " << discStatus(status) << endl;
}
void KCompactDisc::stop()
@@ -380,9 +380,9 @@ void KCompactDisc::timerExpired()
if (WM_CDS_NO_DISC(m_status) || (m_device == TQString()))
{
- if (m_previoustqStatus != m_status)
+ if (m_previousStatus != m_status)
{
- m_previoustqStatus = m_status;
+ m_previousStatus = m_status;
m_discId = missingDisc;
m_previousDiscId = 0;
m_trackArtists.clear();
@@ -428,7 +428,7 @@ void KCompactDisc::timerExpired()
else
{
m_trackArtists.append(i18n("Unknown Artist"));
- m_trackTitles.append(i18n("Track %1").tqarg(TQString::number(i).rightJustify(2, '0')));
+ m_trackTitles.append(i18n("Track %1").arg(TQString::number(i).rightJustify(2, '0')));
}
// FIXME: KDE4
// track.length = cd->trk[i - 1].length;
@@ -450,12 +450,12 @@ void KCompactDisc::timerExpired()
}
if (isPlaying())
{
- m_previoustqStatus = m_status;
+ m_previousStatus = m_status;
// Update the current playing position.
emit trackPlaying(m_track, trackPosition());
}
else
- if (m_previoustqStatus != m_status)
+ if (m_previousStatus != m_status)
{
// If we are not playing, then we are either paused, or stopped.
switch (m_status)
@@ -467,7 +467,7 @@ void KCompactDisc::timerExpired()
emit trayOpening();
break;
default:
- if (m_previoustqStatus == WM_CDM_PLAYING || m_previoustqStatus == WM_CDM_PAUSED
+ if (m_previousStatus == WM_CDM_PLAYING || m_previousStatus == WM_CDM_PAUSED
&& m_status == WM_CDM_STOPPED)
{
emit discStopped();
@@ -475,7 +475,7 @@ void KCompactDisc::timerExpired()
break;
}
- m_previoustqStatus = m_status;
+ m_previousStatus = m_status;
}
}