From 83b79bb29aaa412caec6abcdb42ca21d248b3b3a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:06:28 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- plugins/audiooutput/alsa/k3balsaoutputplugin.cpp | 6 +++--- plugins/encoder/external/k3bexternalencodercommand.cpp | 2 +- plugins/encoder/external/k3bexternalencoderconfigwidget.cpp | 2 +- plugins/encoder/lame/k3blameencoder.cpp | 8 ++++---- plugins/encoder/ogg/k3boggvorbisencoder.cpp | 8 ++++---- plugins/encoder/skeleton.cpp | 4 ++-- plugins/encoder/sox/k3bsoxencoder.cpp | 8 ++++---- .../audiometainforenamer/k3baudiometainforenamerplugin.cpp | 4 ++-- .../project/audiometainforenamer/k3baudiometainforenamerplugin.h | 4 ++-- plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) (limited to 'plugins') diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp index 192c337..8781401 100644 --- a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp +++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp @@ -148,7 +148,7 @@ bool K3bAlsaOutputPlugin::init() { cleanup(); - KConfigGroup c( k3bcore->config(), "Alsa Output Plugin" ); + TDEConfigGroup c( k3bcore->config(), "Alsa Output Plugin" ); TQString alsaDevice = c.readEntry( "output device", "default" ); int err = snd_pcm_open( &d->pcm_playback, alsaDevice.local8Bit(), SND_PCM_STREAM_PLAYBACK, 0 ); @@ -276,7 +276,7 @@ K3bAlsaOutputPluginConfigWidget::~K3bAlsaOutputPluginConfigWidget() void K3bAlsaOutputPluginConfigWidget::loadConfig() { - KConfigGroup c( k3bcore->config(), "Alsa Output Plugin" ); + TDEConfigGroup c( k3bcore->config(), "Alsa Output Plugin" ); m_comboDevice->setCurrentText( c.readEntry( "output device", "default" ) ); } @@ -284,7 +284,7 @@ void K3bAlsaOutputPluginConfigWidget::loadConfig() void K3bAlsaOutputPluginConfigWidget::saveConfig() { - KConfigGroup c( k3bcore->config(), "Alsa Output Plugin" ); + TDEConfigGroup c( k3bcore->config(), "Alsa Output Plugin" ); c.writeEntry( "output device", m_comboDevice->currentText() ); } diff --git a/plugins/encoder/external/k3bexternalencodercommand.cpp b/plugins/encoder/external/k3bexternalencodercommand.cpp index 57a0858..5ab3b1c 100644 --- a/plugins/encoder/external/k3bexternalencodercommand.cpp +++ b/plugins/encoder/external/k3bexternalencodercommand.cpp @@ -25,7 +25,7 @@ TQValueList K3bExternalEncoderCommand::readCommands() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bExternalEncoderPlugin" ); diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp index 7f2b289..beec64b 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp @@ -203,7 +203,7 @@ void K3bExternalEncoderSettingsWidget::loadConfig() void K3bExternalEncoderSettingsWidget::saveConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->deleteGroup( "K3bExternalEncoderPlugin", true ); c->setGroup( "K3bExternalEncoderPlugin" ); diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp index 3db51c7..200494c 100644 --- a/plugins/encoder/lame/k3blameencoder.cpp +++ b/plugins/encoder/lame/k3blameencoder.cpp @@ -195,7 +195,7 @@ const TQString& K3bLameEncoder::filename() const bool K3bLameEncoder::initEncoderInternal( const TQString&, const K3b::Msf& length ) { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); d->flags = lame_init(); @@ -485,7 +485,7 @@ void K3bLameEncoderSettingsWidget::slotQualityLevelChanged( int val ) void K3bLameEncoderSettingsWidget::loadConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); TQString mode = c->readEntry( "Mode", "stereo" ); @@ -532,7 +532,7 @@ void K3bLameEncoderSettingsWidget::loadConfig() void K3bLameEncoderSettingsWidget::saveConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); TQString mode; @@ -588,7 +588,7 @@ TQString K3bLameEncoder::fileTypeComment( const TQString& ) const long long K3bLameEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); int bitrate = 0; if( c->readBoolEntry( "Manual Bitrate Settings", false ) ) { diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp index 29ad94f..35294fa 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp +++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp @@ -411,7 +411,7 @@ void K3bOggVorbisEncoder::cleanup() void K3bOggVorbisEncoder::loadConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bOggVorbisEncoderPlugin" ); @@ -476,7 +476,7 @@ void K3bOggVorbisEncoderSettingsWidget::slotQualityLevelChanged( int val ) void K3bOggVorbisEncoderSettingsWidget::loadConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bOggVorbisEncoderPlugin" ); @@ -497,7 +497,7 @@ void K3bOggVorbisEncoderSettingsWidget::loadConfig() void K3bOggVorbisEncoderSettingsWidget::saveConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bOggVorbisEncoderPlugin" ); @@ -518,7 +518,7 @@ TQString K3bOggVorbisEncoder::fileTypeComment( const TQString& ) const long long K3bOggVorbisEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bOggVorbisEncoderPlugin" ); // the following code is based on the size estimation from the audiocd kioslave diff --git a/plugins/encoder/skeleton.cpp b/plugins/encoder/skeleton.cpp index e7cc01e..0fc3d1e 100644 --- a/plugins/encoder/skeleton.cpp +++ b/plugins/encoder/skeleton.cpp @@ -104,7 +104,7 @@ K3bEncoderSettingsWidget::~K3bEncoderSettingsWidget() void K3bEncoderSettingsWidget::loadConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bEncoderPlugin" ); // PUT YOUR CODE HERE @@ -113,7 +113,7 @@ void K3bEncoderSettingsWidget::loadConfig() void K3bEncoderSettingsWidget::saveConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bEncoderPlugin" ); // PUT YOUR CODE HERE diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index 37b5a66..3cd7f08 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -201,7 +201,7 @@ bool K3bSoxEncoder::initEncoderInternal( const TQString& extension ) // output settings *d->process << "-t" << extension; - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bSoxEncoderPlugin" ); if( c->readBoolEntry( "manual settings", false ) ) { *d->process << "-r" << TQString::number( c->readNumEntry( "samplerate", 44100 ) ) @@ -348,7 +348,7 @@ TQString K3bSoxEncoder::fileTypeComment( const TQString& ext ) const long long K3bSoxEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const { // for now we make a rough assumption based on the settings - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bSoxEncoderPlugin" ); if( c->readBoolEntry( "manual settings", false ) ) { int sr = c->readNumEntry( "samplerate", 44100 ); @@ -392,7 +392,7 @@ K3bSoxEncoderSettingsWidget::~K3bSoxEncoderSettingsWidget() void K3bSoxEncoderSettingsWidget::loadConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bSoxEncoderPlugin" ); @@ -428,7 +428,7 @@ void K3bSoxEncoderSettingsWidget::loadConfig() void K3bSoxEncoderSettingsWidget::saveConfig() { - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "K3bSoxEncoderPlugin" ); diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index 22edc55..3d30d29 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -146,13 +146,13 @@ void K3bAudioMetainfoRenamerPluginWidget::loadDefaults() } -void K3bAudioMetainfoRenamerPluginWidget::readSettings( KConfigBase* c ) +void K3bAudioMetainfoRenamerPluginWidget::readSettings( TDEConfigBase* c ) { d->comboPattern->setEditText( c->readEntry( "rename pattern", "%a - %t" ) ); } -void K3bAudioMetainfoRenamerPluginWidget::saveSettings( KConfigBase* c ) +void K3bAudioMetainfoRenamerPluginWidget::saveSettings( TDEConfigBase* c ) { c->writeEntry( "rename pattern", d->comboPattern->currentText() ); } diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h index 2612caf..649e40f 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h @@ -42,8 +42,8 @@ class K3bAudioMetainfoRenamerPluginWidget : public TQWidget, public K3bProjectPl TQString subTitle() const; void loadDefaults(); - void readSettings( KConfigBase* ); - void saveSettings( KConfigBase* ); + void readSettings( TDEConfigBase* ); + void saveSettings( TDEConfigBase* ); void activate(); diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp index 2f93124..3699612 100644 --- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp +++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp @@ -83,7 +83,7 @@ void K3bAudioProjectCddbPlugin::activate( K3bDoc* doc, TQWidget* parent ) } // read the k3b config :) - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup("Cddb"); m_cddb->readConfig( c ); @@ -111,7 +111,7 @@ void K3bAudioProjectCddbPlugin::slotCddbQueryFinished( int error ) K3bCddbResultEntry cddbInfo = m_cddb->result(); // save the entry locally - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "Cddb" ); if( c->readBoolEntry( "save cddb entries locally", true ) ) m_cddb->saveEntry( cddbInfo ); -- cgit v1.2.3