diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:58 -0600 |
| commit | 281d226f744d70a826a3bffff1ee964ef5915d4f (patch) | |
| tree | c42d5ae7840ea2a74f5f6c1b1a958569a8d2bf27 /plugins/encoder | |
| parent | e8585949197fd7b5423328b0aeb8cceffa18f0db (diff) | |
| download | k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'plugins/encoder')
| -rw-r--r-- | plugins/encoder/external/k3bexternalencoder.cpp | 2 | ||||
| -rw-r--r-- | plugins/encoder/external/k3bexternalencoderconfigwidget.cpp | 4 | ||||
| -rw-r--r-- | plugins/encoder/lame/k3blameencoder.cpp | 2 | ||||
| -rw-r--r-- | plugins/encoder/ogg/k3boggvorbisencoder.cpp | 2 | ||||
| -rw-r--r-- | plugins/encoder/skeleton.cpp | 2 | ||||
| -rw-r--r-- | plugins/encoder/sox/k3bsoxencoder.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp index a21b7e2..10fb35b 100644 --- a/plugins/encoder/external/k3bexternalencoder.cpp +++ b/plugins/encoder/external/k3bexternalencoder.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqregexp.h> diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp index 7384ba6..0f89798 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp @@ -23,9 +23,9 @@ #include <tqpushbutton.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp index c201465..127422b 100644 --- a/plugins/encoder/lame/k3blameencoder.cpp +++ b/plugins/encoder/lame/k3blameencoder.cpp @@ -20,7 +20,7 @@ #include <k3bcore.h> #include <k3bpluginfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <kinstance.h> diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp index bcf3903..c2ce5b3 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp +++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp @@ -21,7 +21,7 @@ #include <k3bcore.h> #include <k3bpluginfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <knuminput.h> diff --git a/plugins/encoder/skeleton.cpp b/plugins/encoder/skeleton.cpp index 9321501..38f147d 100644 --- a/plugins/encoder/skeleton.cpp +++ b/plugins/encoder/skeleton.cpp @@ -17,7 +17,7 @@ #include "k3b<name>encoder.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index b0f734d..d91502f 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfileinfo.h> #include <tqfile.h> |