From 09a22d33a25cf6f9bf6ec2db5db4fc350cc7cea9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 7 Feb 2013 17:57:16 -0600 Subject: Rename KComp to avoid conflicts with KDE4 --- kscd/kscd.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kscd/kscd.cpp') diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index 24a12a68..02186e81 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -98,7 +98,7 @@ KSCD::KSCD( TQWidget *parent, const char *name ) updateTime(true), m_dockWidget(0) { - m_cd = new KCompactDisc(); + m_cd = new TDECompactDisc(); cddbInfo.clear(); // The first freedb revision is "0" //!!!! random_current = random_list.begin(); @@ -379,7 +379,7 @@ void KSCD::setupPopups() void KSCD::playClicked() { - if (m_cd->discId() == KCompactDisc::missingDisc) + if (m_cd->discId() == TDECompactDisc::missingDisc) return; kapp->processEvents(); @@ -801,7 +801,7 @@ void KSCD::setDevicePaths() // This device did not seem usable. TQString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\ "Please make sure you have access permissions to:\n%1").arg( - KCompactDisc::urlToDevice(Prefs::cdDevice())); + TDECompactDisc::urlToDevice(Prefs::cdDevice())); KMessageBox::error(this, str, i18n("Error")); } } // setDevicePath() @@ -956,7 +956,7 @@ int KSCD::prev_randomtrack() void KSCD::discChanged(unsigned discId) { cddbInfo.clear(); - if (discId == KCompactDisc::missingDisc) + if (discId == TDECompactDisc::missingDisc) { statuslabel->setText(i18n("No disc")); } @@ -1018,7 +1018,7 @@ void KSCD::discChanged(unsigned discId) void KSCD::discStopped() { - if (Prefs::ejectOnFinish() && !stoppedByUser && (m_cd->discId() != KCompactDisc::missingDisc)) + if (Prefs::ejectOnFinish() && !stoppedByUser && (m_cd->discId() != TDECompactDisc::missingDisc)) { ejectClicked(); } @@ -1174,7 +1174,7 @@ void KSCD::CDDialogDone() void KSCD::lookupCDDB() { - if (m_cd->discId() == KCompactDisc::missingDisc) + if (m_cd->discId() == TDECompactDisc::missingDisc) return; kdDebug(67000) << "lookupCDDB() called" << endl; @@ -1319,7 +1319,7 @@ int KSCD::getStatus() return 2; else if (m_cd->isPaused()) return 4; - else if (m_cd->discId() != KCompactDisc::missingDisc) + else if (m_cd->discId() != TDECompactDisc::missingDisc) return 5; else return 6; -- cgit v1.2.1