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 --- kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp') diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index fbe758ba..adff68f3 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -41,18 +41,18 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) setButtons(Default|Apply); - config = new KConfig("kcmaudiocdrc"); + config = new TDEConfig("kcmaudiocdrc"); TQPtrList encoders; AudioCDEncoder::findAllPlugins(0, encoders); AudioCDEncoder *encoder; for ( encoder = encoders.first(); encoder; encoder = encoders.next() ){ if (encoder->init()) { - KConfigSkeleton *config = NULL; + TDEConfigSkeleton *config = NULL; TQWidget *widget = encoder->getConfigureWidget(&config); if(widget && config){ tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type())); - KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1()); + TDEConfigDialogManager *configManager = new TDEConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1()); encoderSettings.append(configManager); } } @@ -60,7 +60,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) load(); - KConfigDialogManager *widget; + TDEConfigDialogManager *widget; for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){ connect(widget, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(slotModuleChanged())); } @@ -135,7 +135,7 @@ void KAudiocdModule::save() { if (!configChanged ) return; { - KConfigGroupSaver saver(config, "CDDA"); + TDEConfigGroupSaver saver(config, "CDDA"); // autosearch is the name of the config option, which has the // reverse sense of the current text of the configuration option, @@ -149,7 +149,7 @@ void KAudiocdModule::save() { } { - KConfigGroupSaver saver(config, "FileName"); + TDEConfigGroupSaver saver(config, "FileName"); config->writeEntry("file_name_template", fileNameLineEdit->text()); config->writeEntry("album_name_template", albumNameLineEdit->text()); config->writeEntry("regexp_example", example->text()); @@ -168,7 +168,7 @@ void KAudiocdModule::save() { config->writeEntry("regexp_replace", replaceOutput); } - KConfigDialogManager *widget; + TDEConfigDialogManager *widget; for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){ widget->updateSettings(); } @@ -188,7 +188,7 @@ void KAudiocdModule::load(bool useDefaults) { config->setReadDefaults( useDefaults ); { - KConfigGroupSaver saver(config, "CDDA"); + TDEConfigGroupSaver saver(config, "CDDA"); // Specify <=> not autosearch, as explained above in ::save() @@ -200,7 +200,7 @@ void KAudiocdModule::load(bool useDefaults) { } { - KConfigGroupSaver saver(config, "FileName"); + TDEConfigGroupSaver saver(config, "FileName"); fileNameLineEdit->setText(config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}")); albumNameLineEdit->setText(config->readEntry("album_name_template", "%{albumartist} - %{albumtitle}")); kcfg_replaceInput->setText(config->readEntry("regexp_search")); @@ -208,7 +208,7 @@ void KAudiocdModule::load(bool useDefaults) { example->setText(config->readEntry("example", i18n("Cool artist - example audio file.wav"))); } - KConfigDialogManager *widget; + TDEConfigDialogManager *widget; for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){ widget->updateWidgets(); } @@ -217,7 +217,7 @@ void KAudiocdModule::load(bool useDefaults) { } void KAudiocdModule::slotModuleChanged() { - KConfigDialogManager *widget; + TDEConfigDialogManager *widget; for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){ if(widget->hasChanged()){ slotConfigChanged(); @@ -259,7 +259,7 @@ TQString KAudiocdModule::quickHelp() const extern "C" { - KCModule *create_audiocd(TQWidget *parent, const char */*name*/) + TDECModule *create_audiocd(TQWidget *parent, const char */*name*/) { return new KAudiocdModule(parent, "kcmaudiocd"); } -- cgit v1.2.1