From 83b79bb29aaa412caec6abcdb42ca21d248b3b3a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:06:28 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 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 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'plugins/encoder')

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> 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 @@ K3b<name>EncoderSettingsWidget::~K3b<name>EncoderSettingsWidget()
 
 void K3b<name>EncoderSettingsWidget::loadConfig()
 {
-  KConfig* c = k3bcore->config();
+  TDEConfig* c = k3bcore->config();
   c->setGroup( "K3b<name>EncoderPlugin" );
 
   // PUT YOUR CODE HERE
@@ -113,7 +113,7 @@ void K3b<name>EncoderSettingsWidget::loadConfig()
 
 void K3b<name>EncoderSettingsWidget::saveConfig()
 {
-  KConfig* c = k3bcore->config();
+  TDEConfig* c = k3bcore->config();
   c->setGroup( "K3b<name>EncoderPlugin" );
 
   // 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" );
 
-- 
cgit v1.2.3