From de9a6aa007626eba4e333ac4080cbdfcb9f98386 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:36 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kaudiocreator/encoderconfigimp.cpp | 16 ++++++++-------- kaudiocreator/kaudiocreator.cpp | 8 ++++---- kaudiocreator/kaudiocreator.h | 8 ++++---- kaudiocreator/ripper.cpp | 26 +++++++++++++------------- kaudiocreator/ripper.h | 6 +++--- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'kaudiocreator') diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index 96c7810f..cc4d1ad5 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -130,10 +130,10 @@ void EncoderConfigImp::addEncoderSlot(){ number++; } - if(KConfigDialog::showDialog(groupName.latin1())) + if(TDEConfigDialog::showDialog(groupName.latin1())) return; - KConfigDialog *dialog = new KConfigDialog(this, groupName.latin1(), EncoderPrefs::prefs(groupName), + TDEConfigDialog *dialog = new TDEConfigDialog(this, groupName.latin1(), EncoderPrefs::prefs(groupName), KDialogBase::Swallow, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); @@ -168,7 +168,7 @@ void EncoderConfigImp::removeEncoderSlot(){ TQString groupName = encoderNames[kcfg_currentEncoder->currentText()]; kcfg_currentEncoder->removeItem(kcfg_currentEncoder->currentItem()); - delete KConfigDialog::exists(groupName.latin1()); + delete TDEConfigDialog::exists(groupName.latin1()); EncoderPrefs::deletePrefs(groupName); } @@ -186,14 +186,14 @@ void EncoderConfigImp::configureEncoderSlot() { return; } TQString groupName = encoderNames[kcfg_currentEncoder->currentText()]; - KConfig &config = *TDEGlobal::config(); + TDEConfig &config = *TDEGlobal::config(); if(!config.hasGroup(groupName)) return; - if(KConfigDialog::showDialog(groupName.latin1())) + if(TDEConfigDialog::showDialog(groupName.latin1())) return; - KConfigDialog *dialog = new KConfigDialog(this, groupName.latin1(), EncoderPrefs::prefs(groupName), + TDEConfigDialog *dialog = new TDEConfigDialog(this, groupName.latin1(), EncoderPrefs::prefs(groupName), KDialogBase::Swallow, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); @@ -272,13 +272,13 @@ EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName) bool EncoderPrefs::hasPrefs(const TQString &groupName) { - KConfig &config = *TDEGlobal::config(); + TDEConfig &config = *TDEGlobal::config(); return config.hasGroup(groupName); } void EncoderPrefs::deletePrefs(const TQString &groupName) { - KConfig &config = *TDEGlobal::config(); + TDEConfig &config = *TDEGlobal::config(); config.deleteGroup(groupName); if (!m_prefs) return; diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index c5db6337..df7a9fc6 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -224,7 +224,7 @@ void KAudioCreator::encodeFile(){ * Show Settings dialog. */ void KAudioCreator::showSettings(){ - if(KConfigDialog::showDialog("settings")) + if(TDEConfigDialog::showDialog("settings")) return; SettingsDialog *dialog = new SettingsDialog(this, "settings", Prefs::self()); @@ -235,8 +235,8 @@ void KAudioCreator::showSettings(){ dialog->show(); } -SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config) - : KConfigDialog(parent, name, config), +SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkeleton *config) + : TDEConfigDialog(parent, name, config), cddb(0), cddbChanged(false) { addPage(new General(0, "General"), i18n("General"), "package_settings", @@ -248,7 +248,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleto KService::Ptr libkcddb = KService::serviceByDesktopName("libkcddb"); if (libkcddb && libkcddb->isValid()) { - cddb = KCModuleLoader::loadModule(TQString("libkcddb"), KCModuleLoader::Inline); + cddb = TDECModuleLoader::loadModule(TQString("libkcddb"), TDECModuleLoader::Inline); if (cddb) { cddb->load(); diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index 72d8f2bc..0ba8f6aa 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -29,7 +29,7 @@ class TracksImp; class JobQueImp; class Ripper; class Encoder; -class KCModule; +class TDECModule; class EncoderConfigImp; class KPopupMenu; @@ -66,12 +66,12 @@ private: }; -class SettingsDialog: public KConfigDialog { +class SettingsDialog: public TDEConfigDialog { Q_OBJECT public: - SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config); + SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkeleton *config); protected slots: void updateSettings(); @@ -87,7 +87,7 @@ public: EncoderConfigImp *encoderConfigImp; private: - KCModule *cddb; + TDECModule *cddb; bool cddbChanged; }; diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index f68c1001..e2366fd7 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -49,16 +49,16 @@ void Ripper::loadSettings(){ */ Ripper::~Ripper(){ pendingJobs.clear(); - TQMap::Iterator it; + TQMap::Iterator it; for( it = jobs.begin(); it != jobs.end(); ++it ){ - KIO::Job* ioJob = it.key(); + TDEIO::Job* ioJob = it.key(); Job *job = it.data(); delete job; if(ioJob){ - KIO::FileCopyJob *copyJob = static_cast (ioJob); - disconnect(copyJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(copyJobResult(KIO::Job*))); - disconnect(copyJob, TQT_SIGNAL(percent ( KIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( KIO::Job *, unsigned long))); + TDEIO::FileCopyJob *copyJob = static_cast (ioJob); + disconnect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*))); + disconnect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); TQString fileDestination = (copyJob->destURL()).path(); copyJob->kill(); TQFile file( fileDestination ); @@ -89,10 +89,10 @@ int Ripper::pendingJobCount() { * @param id the id number of the job to remove. */ void Ripper::removeJob(int id){ - TQMap::Iterator it; + TQMap::Iterator it; for( it = jobs.begin(); it != jobs.end(); ++it ){ if(it.data()->id == id){ - KIO::FileCopyJob *copyJob = dynamic_cast (it.key()); + TDEIO::FileCopyJob *copyJob = dynamic_cast (it.key()); if(copyJob){ TQString fileDestination = (copyJob->destURL()).path(); copyJob->kill(); @@ -182,10 +182,10 @@ void Ripper::tendToNewJobs(){ KURL source(wavFile); KURL dest(tmp.name()); - KIO::FileCopyJob *copyJob = new KIO::FileCopyJob(source, dest, 0644, false, true, false, false); + TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob(source, dest, 0644, false, true, false, false); jobs.insert(copyJob, job); - connect(copyJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(copyJobResult(KIO::Job*))); - connect(copyJob, TQT_SIGNAL(percent ( KIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( KIO::Job *, unsigned long))); + connect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*))); + connect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); emit jobsChanged(); } @@ -195,10 +195,10 @@ void Ripper::tendToNewJobs(){ * information dialog. * @param copyjob the IO job to copy from */ -void Ripper::copyJobResult(KIO::Job *copyjob){ +void Ripper::copyJobResult(TDEIO::Job *copyjob){ if(!copyjob) return; - KIO::FileCopyJob *copyJob = dynamic_cast (copyjob); + TDEIO::FileCopyJob *copyJob = dynamic_cast (copyjob); KNotifyClient::event("track ripped"); if(jobs.find(copyjob) == jobs.end()) @@ -251,7 +251,7 @@ void Ripper::ejectNow(){ * @param job the current ioslave job in progress * @param percent the current percent that the ioslave has done. */ -void Ripper::updateProgress( KIO::Job *job, unsigned long percent){ +void Ripper::updateProgress( TDEIO::Job *job, unsigned long percent){ if(job){ Job *ripJob = (jobs[job]); if(ripJob) diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h index cec00ea2..3804b8ad 100644 --- a/kaudiocreator/ripper.h +++ b/kaudiocreator/ripper.h @@ -52,15 +52,15 @@ public slots: void removeJob( int id ); private slots: - void copyJobResult( KIO::Job *job ); - void updateProgress( KIO::Job *job, unsigned long percent ); + void copyJobResult( TDEIO::Job *job ); + void updateProgress( TDEIO::Job *job, unsigned long percent ); void tendToNewJobs(); void ejectNow(); private: TQString deviceToEject; // Jobs that we are currently doing. - TQMap jobs; + TQMap jobs; // Jobs that we want to do , but haven't done yet TQPtrList pendingJobs; }; -- cgit v1.2.1