summaryrefslogtreecommitdiffstats
path: root/plugins/encoder
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:52:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:52:05 -0600
commitd796716f1dc9dd0b198863d974a03bf356f636e6 (patch)
tree1bab87345ab25163397b8033b7e1910360bd94fb /plugins/encoder
parent6f156aae95c8ea00b34ffb59e237df2f00cf8256 (diff)
downloadk3b-d796716f1dc9dd0b198863d974a03bf356f636e6.tar.gz
k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'plugins/encoder')
-rw-r--r--plugins/encoder/external/k3bexternalencoder.cpp2
-rw-r--r--plugins/encoder/external/k3bexternalencodercommand.cpp2
-rw-r--r--plugins/encoder/external/k3bexternalencoderconfigwidget.cpp2
-rw-r--r--plugins/encoder/lame/k3blameencoder.cpp2
-rw-r--r--plugins/encoder/ogg/k3boggvorbisencoder.cpp4
-rw-r--r--plugins/encoder/skeleton.cpp2
-rw-r--r--plugins/encoder/sox/k3bsoxencoder.cpp2
7 files changed, 8 insertions, 8 deletions
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>