diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:23 -0600 |
| commit | 6a2fe24d053050ad288e1a942b8d892822c8522e (patch) | |
| tree | 43a87ede32666681e744ce05daec6e96aca42ebd /kaffeine/src/input/disc | |
| parent | 1ddf4884f429b6360860dffc976b794bc4568504 (diff) | |
| download | kaffeine-6a2fe24d053050ad288e1a942b8d892822c8522e.tar.gz kaffeine-6a2fe24d053050ad288e1a942b8d892822c8522e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kaffeine/src/input/disc')
| -rw-r--r-- | kaffeine/src/input/disc/disc.h | 2 | ||||
| -rw-r--r-- | kaffeine/src/input/disc/paranoia.cpp | 2 | ||||
| -rw-r--r-- | kaffeine/src/input/disc/paranoia.h | 2 | ||||
| -rw-r--r-- | kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h | 2 | ||||
| -rw-r--r-- | kaffeine/src/input/disc/plugins/mp3lame/klameenc.h | 2 | ||||
| -rw-r--r-- | kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/kaffeine/src/input/disc/disc.h b/kaffeine/src/input/disc/disc.h index 8c22ced..dae99e3 100644 --- a/kaffeine/src/input/disc/disc.h +++ b/kaffeine/src/input/disc/disc.h @@ -23,7 +23,7 @@ #include <kaction.h> #include <kstdaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <tqframe.h> diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp index a38ef9a..14827e2 100644 --- a/kaffeine/src/input/disc/paranoia.cpp +++ b/kaffeine/src/input/disc/paranoia.cpp @@ -42,7 +42,7 @@ #include <ktrader.h> #include <kpushbutton.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tdeparts/componentfactory.h> #include "paranoia.h" diff --git a/kaffeine/src/input/disc/paranoia.h b/kaffeine/src/input/disc/paranoia.h index 8cf7106..485be28 100644 --- a/kaffeine/src/input/disc/paranoia.h +++ b/kaffeine/src/input/disc/paranoia.h @@ -25,7 +25,7 @@ #include <tqthread.h> #include <tqwidget.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kaffeineaudioencoder.h" #include "paranoiasettings.h" diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h index 0469fba..61144a5 100644 --- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h +++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h @@ -22,7 +22,7 @@ #define KAFFEINEAUDIOENCODER_H #include <tdeparts/part.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqstring.h> #include <tqwidget.h> diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h index 7132fe9..1796020 100644 --- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h +++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h @@ -23,7 +23,7 @@ #include <lame/lame.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kaffeineaudioencoder.h" #include "lameconfig.h" diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h index 0000179..4096360 100644 --- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h +++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h @@ -31,7 +31,7 @@ extern "C" #include <vorbis/vorbisenc.h> } -#include <kconfig.h> +#include <tdeconfig.h> #include "kaffeineaudioencoder.h" #include "oggconfig.h" |