diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:44:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:44:58 -0600 |
| commit | 281d226f744d70a826a3bffff1ee964ef5915d4f (patch) | |
| tree | c42d5ae7840ea2a74f5f6c1b1a958569a8d2bf27 /plugins/decoder | |
| parent | e8585949197fd7b5423328b0aeb8cceffa18f0db (diff) | |
| download | k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'plugins/decoder')
| -rw-r--r-- | plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 2 | ||||
| -rw-r--r-- | plugins/decoder/flac/k3bflacdecoder.cpp | 2 | ||||
| -rw-r--r-- | plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp | 2 | ||||
| -rw-r--r-- | plugins/decoder/mp3/k3bmaddecoder.cpp | 2 | ||||
| -rw-r--r-- | plugins/decoder/musepack/k3bmpcdecoder.cpp | 2 | ||||
| -rw-r--r-- | plugins/decoder/ogg/k3boggvorbisdecoder.cpp | 2 | ||||
| -rw-r--r-- | plugins/decoder/wave/k3bwavedecoder.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp index d4b7778..bb2253a 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp @@ -24,7 +24,7 @@ extern "C" { #include <string.h> -#include <klocale.h> +#include <tdelocale.h> #if LIBAVFORMAT_BUILD < 4629 diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp index 7177071..671bf4c 100644 --- a/plugins/decoder/flac/k3bflacdecoder.cpp +++ b/plugins/decoder/flac/k3bflacdecoder.cpp @@ -23,7 +23,7 @@ #include <kurl.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <string.h> #include <math.h> diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp index 8103b44..ad094a6 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp @@ -25,7 +25,7 @@ #include <kurl.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp index 951caa2..a28e24b 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.cpp +++ b/plugins/decoder/mp3/k3bmaddecoder.cpp @@ -33,7 +33,7 @@ #include <kurl.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqfile.h> diff --git a/plugins/decoder/musepack/k3bmpcdecoder.cpp b/plugins/decoder/musepack/k3bmpcdecoder.cpp index 84dd9d7..3dcbaf3 100644 --- a/plugins/decoder/musepack/k3bmpcdecoder.cpp +++ b/plugins/decoder/musepack/k3bmpcdecoder.cpp @@ -20,7 +20,7 @@ #include <k3bpluginfactory.h> -#include <klocale.h> +#include <tdelocale.h> K_EXPORT_COMPONENT_FACTORY( libk3bmpcdecoder, K3bPluginFactory<K3bMpcDecoderFactory>( "libk3bmpcdecoder" ) ) diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp index 717c1a2..67d7ce9 100644 --- a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp +++ b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp @@ -24,7 +24,7 @@ #include <kurl.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdio.h> #include <stdlib.h> diff --git a/plugins/decoder/wave/k3bwavedecoder.cpp b/plugins/decoder/wave/k3bwavedecoder.cpp index 28f873a..cf27610 100644 --- a/plugins/decoder/wave/k3bwavedecoder.cpp +++ b/plugins/decoder/wave/k3bwavedecoder.cpp @@ -23,7 +23,7 @@ #include <tqcstring.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> |