From d796716f1dc9dd0b198863d974a03bf356f636e6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:52:05 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 plugins/audiooutput/alsa/k3balsaoutputplugin.cpp                      | 2 +-
 plugins/decoder/libsndfile/configure.in.in                            | 2 +-
 plugins/encoder/external/k3bexternalencoder.cpp                       | 2 +-
 plugins/encoder/external/k3bexternalencodercommand.cpp                | 2 +-
 plugins/encoder/external/k3bexternalencoderconfigwidget.cpp           | 2 +-
 plugins/encoder/lame/k3blameencoder.cpp                               | 2 +-
 plugins/encoder/ogg/k3boggvorbisencoder.cpp                           | 4 ++--
 plugins/encoder/skeleton.cpp                                          | 2 +-
 plugins/encoder/sox/k3bsoxencoder.cpp                                 | 2 +-
 .../project/audiometainforenamer/k3baudiometainforenamerplugin.cpp    | 4 ++--
 plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp        | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugins')

diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
index 8781401..afacdf6 100644
--- a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
+++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 
 #include <tqlayout.h>
diff --git a/plugins/decoder/libsndfile/configure.in.in b/plugins/decoder/libsndfile/configure.in.in
index 5c17cca..6b50a68 100644
--- a/plugins/decoder/libsndfile/configure.in.in
+++ b/plugins/decoder/libsndfile/configure.in.in
@@ -3,7 +3,7 @@ dnl
 dnl Don't use PKG_CHECK, since if there is no pkg-config installed,
 dnl then there is no auto* magic for it either.
 dnl
-dnl Tests copied from tdebase/kioslave/thumbnail/
+dnl Tests copied from tdebase/tdeioslave/thumbnail/
 dnl
 if test -z "$PKG_CONFIG"; then
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
index f3a1716..76398fd 100644
--- a/plugins/encoder/external/k3bexternalencoder.cpp
+++ b/plugins/encoder/external/k3bexternalencoder.cpp
@@ -24,7 +24,7 @@
 #include <k3bcore.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/plugins/encoder/external/k3bexternalencodercommand.cpp b/plugins/encoder/external/k3bexternalencodercommand.cpp
index 5ab3b1c..16549e6 100644
--- a/plugins/encoder/external/k3bexternalencodercommand.cpp
+++ b/plugins/encoder/external/k3bexternalencodercommand.cpp
@@ -19,7 +19,7 @@
 
 #include <k3bcore.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
index beec64b..7384ba6 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <klineedit.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 
diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp
index 200494c..c201465 100644
--- a/plugins/encoder/lame/k3blameencoder.cpp
+++ b/plugins/encoder/lame/k3blameencoder.cpp
@@ -21,7 +21,7 @@
 #include <k3bpluginfactory.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <knuminput.h>
diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
index 35294fa..bcf3903 100644
--- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp
+++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
@@ -22,7 +22,7 @@
 #include <k3bpluginfactory.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <knuminput.h>
 
@@ -521,7 +521,7 @@ long long K3bOggVorbisEncoder::fileSize( const TQString&, const K3b::Msf& msf )
   TDEConfig* c = k3bcore->config();
   c->setGroup( "K3bOggVorbisEncoderPlugin" );
 
-  // the following code is based on the size estimation from the audiocd kioslave
+  // the following code is based on the size estimation from the audiocd tdeioslave
   // TODO: reimplement.
 
   if( !c->readBoolEntry( "manual bitrate", false ) ) {
diff --git a/plugins/encoder/skeleton.cpp b/plugins/encoder/skeleton.cpp
index 0fc3d1e..9321501 100644
--- a/plugins/encoder/skeleton.cpp
+++ b/plugins/encoder/skeleton.cpp
@@ -18,7 +18,7 @@
 #include "k3b<name>encoder.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 
diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
index 3cd7f08..b0f734d 100644
--- a/plugins/encoder/sox/k3bsoxencoder.cpp
+++ b/plugins/encoder/sox/k3bsoxencoder.cpp
@@ -24,7 +24,7 @@
 #include <k3bpluginfactory.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <tqfileinfo.h>
diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
index 3d30d29..24a21a6 100644
--- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
+++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
@@ -29,9 +29,9 @@
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmimetype.h>
 #include <kdialog.h>
 
diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
index 3699612..93b12f1 100644
--- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
+++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
@@ -36,7 +36,7 @@
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqstring.h>
 
-- 
cgit v1.2.3